RD-980: Update panning suspend

Author: sasaprodribaba

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

@@ -75,8 +75,6 @@ class MTMapViewController(
         bridge = MTBridge(webViewExecutor)
 
         gestureService = MTGestureService.create(bridge!!, this)
-
-        initializeWorkers()
     }
 
     private suspend fun initializeMap() {
@@ -102,12 +100,13 @@ class MTMapViewController(
     }
 
     private fun initializeWorkers() {
-        zoomableWorker = ZoomableWorker(bridge!!)
-        navigableWorker = NavigableWorker(bridge!!)
+        zoomableWorker = ZoomableWorker(bridge!!, coroutineScope!!)
+        navigableWorker = NavigableWorker(bridge!!, coroutineScope!!)
     }
 
     fun bind(scope: CoroutineScope) {
         coroutineScope = scope
+        initializeWorkers()
     }
 
     fun destroy() {
@@ -131,12 +130,12 @@ class MTMapViewController(
     /**
      * Increases the map's zoom level by 1.
      */
-    override suspend fun zoomIn() = zoomableWorker.zoomIn()
+    override fun zoomIn() = zoomableWorker.zoomIn()
 
     /**
      * Decreases the map's zoom level by 1.
      */
-    override suspend fun zoomOut() = zoomableWorker.zoomOut()
+    override fun zoomOut() = zoomableWorker.zoomOut()
 
     /**
      * Returns the map's current zoom level.
@@ -148,19 +147,19 @@ class MTMapViewController(
      *
      * @param zoom The zoom level to set (0-20).
      */
-    override suspend fun setZoom(zoom: Double) = zoomableWorker.setZoom(zoom)
+    override fun setZoom(zoom: Double) = zoomableWorker.setZoom(zoom)
 
     /**
      * Sets the map's maximum zoom.
      * @param maxZoom Desired zoom.
      */
-    override suspend fun setMaxZoom(maxZoom: Double) = zoomableWorker.setMaxZoom(maxZoom)
+    override fun setMaxZoom(maxZoom: Double) = zoomableWorker.setMaxZoom(maxZoom)
 
     /**
      * Sets the map's minimum zoom.
      * @param minZoom Desired zoom.
      */
-    override suspend fun setMinZoom(minZoom: Double) = zoomableWorker.setMinZoom(minZoom)
+    override fun setMinZoom(minZoom: Double) = zoomableWorker.setMinZoom(minZoom)
 
     // NAVIGABLE
 
@@ -169,12 +168,12 @@ class MTMapViewController(
      *
      * @param offset Offset to pan by.
      */
-    override suspend fun panBy(offset: MTPoint) = navigableWorker.panBy(offset)
+    override fun panBy(offset: MTPoint) = navigableWorker.panBy(offset)
 
     /**
      * Pans the map to the specified location with an animated transition.
      *
      * @param coordinates Coordinates to pan to.
      */
-    override suspend fun panTo(coordinates: LngLat) = navigableWorker.panTo(coordinates)
+    override fun panTo(coordinates: LngLat) = navigableWorker.panTo(coordinates)
 }

MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/workers/navigable/MTNavigable.kt

@@ -9,8 +9,21 @@ package com.maptiler.maptilersdk.map.workers.navigable
 import com.maptiler.maptilersdk.map.LngLat
 import com.maptiler.maptilersdk.map.types.MTPoint
 
+/**
+ * Defines methods for navigating the map.
+ */
 interface MTNavigable {
-    suspend fun panBy(offset: MTPoint)
+    /**
+     * Pans the map by the specified offset.
+     *
+     * @param offset Offset to pan by.
+     */
+    fun panBy(offset: MTPoint)
 
-    suspend fun panTo(coordinates: LngLat)
+    /**
+     * Pans the map to the specified location with an animated transition.
+     *
+     * @param coordinates Coordinates to pan to.
+     */
+    fun panTo(coordinates: LngLat)
 }

MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/workers/navigable/NavigableWorker.kt

@@ -11,19 +11,26 @@ import com.maptiler.maptilersdk.commands.navigation.PanBy
 import com.maptiler.maptilersdk.commands.navigation.PanTo
 import com.maptiler.maptilersdk.map.LngLat
 import com.maptiler.maptilersdk.map.types.MTPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 internal class NavigableWorker(
     private val bridge: MTBridge,
+    private val scope: CoroutineScope,
 ) : MTNavigable {
-    override suspend fun panBy(offset: MTPoint) {
-        bridge.execute(
-            PanBy(offset),
-        )
+    override fun panBy(offset: MTPoint) {
+        scope.launch {
+            bridge.execute(
+                PanBy(offset),
+            )
+        }
     }
 
-    override suspend fun panTo(coordinates: LngLat) {
-        bridge.execute(
-            PanTo(coordinates),
-        )
+    override fun panTo(coordinates: LngLat) {
+        scope.launch {
+            bridge.execute(
+                PanTo(coordinates),
+            )
+        }
     }
 }

MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/workers/zoomable/MTZoomable.kt

@@ -13,12 +13,12 @@ interface MTZoomable {
     /**
      * Increases the map's zoom level by 1.
      */
-    suspend fun zoomIn()
+    fun zoomIn()
 
     /**
      * Decreases the map's zoom level by 1.
      */
-    suspend fun zoomOut()
+    fun zoomOut()
 
     /**
      * Returns the map's current zoom level.
@@ -30,19 +30,19 @@ interface MTZoomable {
      *
      * @param zoom The zoom level to set (0-20).
      */
-    suspend fun setZoom(zoom: Double)
+    fun setZoom(zoom: Double)
 
     /**
      * Sets the map's maximum zoom level.
      *
      * @param maxZoom The max zoom level to set (0-20).
      */
-    suspend fun setMaxZoom(maxZoom: Double)
+    fun setMaxZoom(maxZoom: Double)
 
     /**
      * Sets the map's minimum zoom level.
      *
      * @param minZoom The min zoom level to set (0-20).
      */
-    suspend fun setMinZoom(minZoom: Double)
+    fun setMinZoom(minZoom: Double)
 }

MapTilerSDK/src/main/java/com/maptiler/maptilersdk/map/workers/zoomable/ZoomableWorker.kt

@@ -15,20 +15,27 @@ import com.maptiler.maptilersdk.commands.navigation.SetMinZoom
 import com.maptiler.maptilersdk.commands.navigation.SetZoom
 import com.maptiler.maptilersdk.commands.navigation.ZoomIn
 import com.maptiler.maptilersdk.commands.navigation.ZoomOut
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 internal class ZoomableWorker(
     private val bridge: MTBridge,
+    private val scope: CoroutineScope,
 ) : MTZoomable {
-    override suspend fun zoomIn() {
-        bridge.execute(
-            ZoomIn(),
-        )
+    override fun zoomIn() {
+        scope.launch {
+            bridge.execute(
+                ZoomIn(),
+            )
+        }
     }
 
-    override suspend fun zoomOut() {
-        bridge.execute(
-            ZoomOut(),
-        )
+    override fun zoomOut() {
+        scope.launch {
+            bridge.execute(
+                ZoomOut(),
+            )
+        }
     }
 
     override suspend fun getZoom(): Double {
@@ -44,21 +51,27 @@ internal class ZoomableWorker(
         }
     }
 
-    override suspend fun setZoom(zoom: Double) {
-        bridge.execute(
-            SetZoom(zoom),
-        )
+    override fun setZoom(zoom: Double) {
+        scope.launch {
+            bridge.execute(
+                SetZoom(zoom),
+            )
+        }
     }
 
-    override suspend fun setMaxZoom(maxZoom: Double) {
-        bridge.execute(
-            SetMaxZoom(maxZoom),
-        )
+    override fun setMaxZoom(maxZoom: Double) {
+        scope.launch {
+            bridge.execute(
+                SetMaxZoom(maxZoom),
+            )
+        }
     }
 
-    override suspend fun setMinZoom(minZoom: Double) {
-        bridge.execute(
-            SetMinZoom(minZoom),
-        )
+    override fun setMinZoom(minZoom: Double) {
+        scope.launch {
+            bridge.execute(
+                SetMinZoom(minZoom),
+            )
+        }
     }
 }