1 files changed, 38 insertions, 21 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt
index 1ba8fd6..87fb44a 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt
@@ -27,7 +27,7 @@ import mx.trackermap.TrackerMap.utils.MarkerType
 typealias SetupCallback = () -> Unit
 typealias MarkerCallback = (Int?) -> Unit
 
-class MapFragment : GlobeMapFragment() {
+open class MapFragment : GlobeMapFragment() {
 
     private var loader: QuadImageLoader? = null
 
@@ -68,8 +68,6 @@ class MapFragment : GlobeMapFragment() {
 
     override fun controlHasStarted() {
         Log.d("MapFragment", "controlHasStarted")
-        hasStarted = true
-        setupCallbacks.forEach { it() }
 
         if (tileInfo == null) {
             val layer = MapLayer.defaultLayer
@@ -96,6 +94,14 @@ class MapFragment : GlobeMapFragment() {
         val latitude = 23.191 * Math.PI / 180
         val longitude = -100.36 * Math.PI / 180
         mapControl.setPositionGeo(longitude, latitude, 0.4)
+
+        hasStarted = true
+        setupCallbacks.forEach { it() }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        hasStarted = false
     }
 
     override fun mapDidStopMoving(
@@ -341,19 +347,29 @@ class MapFragment : GlobeMapFragment() {
         height: Double = 0.00001,
         animated: Boolean = true
     ) {
-        mapControl?.addPostSurfaceRunnable {
-            val lat = latitude * Math.PI / 180
-            val lon = longitude * Math.PI / 180
-            // Ensure height is equal or higher than bottom limit
-            val z = height.coerceAtLeast(mapControl.zoomLimitMin)
-            if (animated) {
-                mapControl.animatePositionGeo(lon, lat, z, 0.2)
-            } else {
-                mapControl.setPositionGeo(lon, lat, z)
-            }
+        val lat = latitude * Math.PI / 180
+        val lon = longitude * Math.PI / 180
+        // Ensure height is equal or higher than bottom limit
+        val z = height.coerceAtLeast(mapControl.zoomLimitMin)
+        if (animated) {
+            mapControl.animatePositionGeo(lon, lat, z, 0.2)
+        } else {
+            mapControl.setPositionGeo(lon, lat, z)
         }
     }
 
+    fun zoomIn() {
+        val pos = mapControl.positionGeo.toPoint2d().toDegrees()
+        val zoom = mapControl.currentMapScale() / 2
+        focusOn(pos.y, pos.x, mapControl.heightForMapScale(zoom))
+    }
+
+    fun zoomOut() {
+        val pos = mapControl.positionGeo.toPoint2d().toDegrees()
+        val zoom = mapControl.currentMapScale() * 2
+        focusOn(pos.y, pos.x, mapControl.heightForMapScale(zoom))
+    }
+
     private fun tileInfoSetCacheDir(url: String, tileInfo: TileInfoNew): TileInfoNew? {
         return context?.let {
             val cacheDirName = url.toByteArray(Charsets.UTF_8).md5().hex
@@ -366,14 +382,15 @@ class MapFragment : GlobeMapFragment() {
     }
 
     fun updateLayer(layer: MapLayer.Type) {
-        mapControl?.addPostSurfaceRunnable {
-            MapLayer.layers[layer]?.let {
-                val tileInfo = RemoteTileInfoNew(it.url, it.minZoom, it.maxZoom)
-                this.tileInfo = tileInfoSetCacheDir(it.url, tileInfo)
-                this.tileInfo?.let { t ->
-                    loader?.changeTileInfo(t)
-                    setZoomLimits(tileInfo.minZoom, tileInfo.maxZoom)
-                }
+        MapLayer.layers[layer]?.let {
+            val tileInfo = RemoteTileInfoNew(it.url, it.minZoom, it.maxZoom)
+            this.tileInfo = tileInfoSetCacheDir(it.url, tileInfo)
+            this.tileInfo?.let { t ->
+                loader?.changeTileInfo(t)
+                setZoomLimits(tileInfo.minZoom, tileInfo.maxZoom)
+
+                val pos = mapControl.positionGeo.toPoint2d().toDegrees()
+                focusOn(pos.y, pos.x, mapControl.positionGeo.z, animated = true)
             }
         }
     }