RD-1374: Add GetProjection Getter - Kotlin SDK (#85)

Co-authored-by: klokantechsysadmin <[email protected]>
Co-authored-by: sasaprodribaba <[email protected]>

Author: 3 people

MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/MTMapViewController.kt

@@ -31,6 +31,7 @@ import com.maptiler.maptilersdk.map.options.MTPaddingOptions
 import com.maptiler.maptilersdk.map.style.MTStyle
 import com.maptiler.maptilersdk.map.types.MTData
 import com.maptiler.maptilersdk.map.types.MTPoint
+import com.maptiler.maptilersdk.map.types.MTProjectionType
 import com.maptiler.maptilersdk.map.workers.navigable.MTNavigable
 import com.maptiler.maptilersdk.map.workers.navigable.NavigableWorker
 import com.maptiler.maptilersdk.map.workers.zoomable.MTZoomable
@@ -384,6 +385,11 @@ class MTMapViewController(
      */
     override suspend fun getCenterElevation(): Double = navigableWorker.getCenterElevation()
 
+    /**
+     * Returns the current map projection type. Defaults to [MTProjectionType.MERCATOR] if unavailable.
+     */
+    suspend fun getProjection(): MTProjectionType = style?.getProjection() ?: MTProjectionType.MERCATOR
+
     /**
      * Project coordinates to point on the container.
      */

MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/style/MTStyle.kt

@@ -238,9 +238,9 @@ class MTStyle(
     fun disableTerrain() = stylableWorker.disableTerrain()
 
     /**
-     * Gets the current projection type if set.
+     * Gets the current projection type. Defaults to [MTProjectionType.MERCATOR] when unavailable.
      */
-    suspend fun getProjection(): MTProjectionType? = stylableWorker.getProjection()
+    suspend fun getProjection(): MTProjectionType = stylableWorker.getProjection()
 
     // CONTROLS / STYLE HELPERS
 

MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/workers/stylable/StylableWorker.kt

@@ -289,18 +289,18 @@ internal class StylableWorker(
         }
     }
 
-    suspend fun getProjection(): MTProjectionType? {
+    suspend fun getProjection(): MTProjectionType {
         val returnTypeValue = bridge.execute(GetProjection())
 
         return when (returnTypeValue) {
             is MTBridgeReturnType.StringValue ->
                 when (returnTypeValue.value.trim('"')) { // Android webview returns quoted strings
                     "mercator" -> MTProjectionType.MERCATOR
                     "globe" -> MTProjectionType.GLOBE
-                    else -> null
+                    else -> MTProjectionType.MERCATOR
                 }
-            is MTBridgeReturnType.Null, MTBridgeReturnType.UnsupportedType -> null
-            else -> null
+            is MTBridgeReturnType.Null, MTBridgeReturnType.UnsupportedType -> MTProjectionType.MERCATOR
+            else -> MTProjectionType.MERCATOR
         }
     }
 

MapTilerSDK/src/test/java/com/maptiler/maptilersdk/WorkerAndStyleTests.kt

@@ -13,11 +13,14 @@ import com.maptiler.maptilersdk.bridge.MTCommandExecutable
 import com.maptiler.maptilersdk.commands.navigation.GetBearing
 import com.maptiler.maptilersdk.commands.navigation.GetCenterClampedToGround
 import com.maptiler.maptilersdk.commands.navigation.GetCenterElevation
+import com.maptiler.maptilersdk.commands.style.GetProjection
 import com.maptiler.maptilersdk.map.style.MTMapReferenceStyle
 import com.maptiler.maptilersdk.map.style.MTStyle
 import com.maptiler.maptilersdk.map.style.MTStyleError
 import com.maptiler.maptilersdk.map.style.layer.fill.MTFillLayer
+import com.maptiler.maptilersdk.map.types.MTProjectionType
 import com.maptiler.maptilersdk.map.workers.navigable.NavigableWorker
+import com.maptiler.maptilersdk.map.workers.stylable.StylableWorker
 import junit.framework.TestCase.assertTrue
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
@@ -95,6 +98,39 @@ class WorkerAndStyleTests {
             assertTrue(usedGetCenterElevation)
         }
 
+    @Test fun stylableWorker_getProjection_UsesGetProjectionCommand() =
+        runBlocking {
+            var usedGetProjection = false
+            val exec =
+                object : MTCommandExecutable {
+                    override suspend fun execute(command: MTCommand): MTBridgeReturnType {
+                        if (command is GetProjection) {
+                            usedGetProjection = true
+                        }
+                        return MTBridgeReturnType.StringValue("\"globe\"")
+                    }
+                }
+            val bridge = MTBridge(exec)
+            val worker = StylableWorker(bridge, this)
+
+            val result = worker.getProjection()
+            assertTrue(usedGetProjection)
+            assertEquals(MTProjectionType.GLOBE, result)
+        }
+
+    @Test fun stylableWorker_getProjection_DefaultsToMercatorWhenNull() =
+        runBlocking {
+            val exec =
+                object : MTCommandExecutable {
+                    override suspend fun execute(command: MTCommand): MTBridgeReturnType = MTBridgeReturnType.Null
+                }
+            val bridge = MTBridge(exec)
+            val worker = StylableWorker(bridge, this)
+
+            val result = worker.getProjection()
+            assertEquals(MTProjectionType.MERCATOR, result)
+        }
+
     @Test fun mtStyle_removeLayer_ThrowsWhenMissing() {
         val style = MTStyle(MTMapReferenceStyle.STREETS)
         val layer = MTFillLayer("layer-1", "src-1")