2 files changed, 35 insertions, 25 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 6a80f95..17fc9d4 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
@@ -1,6 +1,7 @@
 package mx.trackermap.TrackerMap.android.map
 
 import android.graphics.Bitmap
+import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Bundle
 import android.util.Log
@@ -48,6 +49,11 @@ class MapFragment : GlobeMapFragment() {
         return MapDisplayType.Map
     }
 
+    override fun preControlCreated() {
+        super.preControlCreated()
+        mapSettings.clearColor = Color.WHITE
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -61,12 +67,12 @@ class MapFragment : GlobeMapFragment() {
         Log.d("MapFragment", "controlHasStarted")
 
         if (tileInfo == null) {
+            val layer = MapLayer.defaultLayer
             // Load default map layer
-            val layer = resources.getStringArray(R.array.maps_streets_tile)
-            val tmpInfo = RemoteTileInfoNew(layer[0], layer[1].toInt(), layer[2].toInt())
-            tileInfo = tileInfoSetCacheDir(layer[0], tmpInfo)
+            val info = RemoteTileInfoNew(layer.url, layer.minZoom, layer.maxZoom)
+            tileInfo = tileInfoSetCacheDir(layer.url, info)
             tileInfo?.let {
-                setZoomLimits(layer[1].toInt(), layer[2].toInt())
+                setZoomLimits(layer.minZoom, layer.maxZoom)
             }
         }
 
@@ -84,7 +90,7 @@ class MapFragment : GlobeMapFragment() {
 
         val latitude = 23.191 * Math.PI / 180
         val longitude = -100.36 * Math.PI / 180
-        mapControl.setPositionGeo(latitude, longitude, 0.4)
+        mapControl.setPositionGeo(longitude, latitude, 0.4)
     }
 
     override fun mapDidStopMoving(
@@ -237,9 +243,11 @@ class MapFragment : GlobeMapFragment() {
             mbr.expandByFraction(0.1)
 
             mapControl?.addPostSurfaceRunnable {
-                val zoom = mapControl.findHeightToViewBounds(mbr, mbr.middle())
-                    .coerceAtLeast(mapControl.zoomLimitMin)
-                mapControl.setPositionGeo(mbr.middle(), zoom)
+                mapControl?.let {
+                    val zoom = it.findHeightToViewBounds(mbr, mbr.middle())
+                        .coerceAtLeast(mapControl.zoomLimitMin)
+                    it.setPositionGeo(mbr.middle(), zoom)
+                }
             }
         }
     }
@@ -328,10 +336,7 @@ class MapFragment : GlobeMapFragment() {
             val lat = latitude * Math.PI / 180
             val lon = longitude * Math.PI / 180
             // Ensure height is equal or higher than bottom limit
-            Log.d("MapFragment", "Target: %7.7f".format(height))
-            Log.d("MapFragment", "Min: %7.7f".format(mapControl.zoomLimitMin))
             val z = height.coerceAtLeast(mapControl.zoomLimitMin)
-            Log.d("MapFragment", "Final: %7.7f".format(z))
             if (animated) {
                 mapControl.animatePositionGeo(lon, lat, z, 0.2)
             } else {
@@ -346,19 +351,20 @@ class MapFragment : GlobeMapFragment() {
             val cacheDirMap = File(it.cacheDir, cacheDirName)
             cacheDirMap.mkdir()
             Log.d("MapFragment", "Cache dir for $url = ${cacheDirMap.absolutePath}")
-
             (tileInfo as? RemoteTileInfoNew)?.cacheDir = cacheDirMap
             tileInfo
         }
     }
 
-    fun updateTile(layer: MapLayer) {
+    fun updateLayer(layer: MapLayer.Type) {
         mapControl?.addPostSurfaceRunnable {
-            val tileInfo = RemoteTileInfoNew(layer.url, layer.minZoom, layer.maxZoom)
-            this.tileInfo = tileInfoSetCacheDir(layer.url, tileInfo)
-            this.tileInfo?.let {
-                loader?.changeTileInfo(it)
-                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)
+                }
             }
         }
     }
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
index 90ee36a..0658f56 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
@@ -15,6 +15,7 @@ import mx.trackermap.TrackerMap.android.shared.MarkerTransformations
 import mx.trackermap.TrackerMap.android.shared.UnitRenderData
 import mx.trackermap.TrackerMap.android.units.UnitFragment
 import mx.trackermap.TrackerMap.android.units.UnitsViewModel
+import mx.trackermap.TrackerMap.client.models.MapLayer
 import mx.trackermap.TrackerMap.client.models.UnitInformation
 
 @DelicateCoroutinesApi
@@ -55,8 +56,8 @@ class UnitMapFragment(private val unitsViewModel: UnitsViewModel) : UnitFragment
         unitsMapFragment = childFragmentManager.findFragmentById(R.id.unitsMap) as MapFragment
         unitsMapFragment.markerCallback = unitsViewModel::selectUnitWith
 
-        val layer = resources.getStringArray(R.array.maps_streets_tile)
-        binding.attributionText.text = HtmlCompat.fromHtml(layer[3], 0)
+        val layer = MapLayer.defaultLayer
+        binding.attributionText.text = HtmlCompat.fromHtml(layer.attribution, 0)
     }
 
     private fun setupObservers() {
@@ -67,8 +68,7 @@ class UnitMapFragment(private val unitsViewModel: UnitsViewModel) : UnitFragment
 
             unitsMapFragment.display(
                 units.mapNotNull(MarkerTransformations::unitToMarker).toTypedArray(),
-                isReport = false,
-                center = unitsViewModel.selectedUnit.value == null
+                isReport = false
             )
         }
 
@@ -98,9 +98,13 @@ class UnitMapFragment(private val unitsViewModel: UnitsViewModel) : UnitFragment
             }
         }
 
-        unitsViewModel.mapLayer.observe(viewLifecycleOwner) { layer ->
+        unitsViewModel.mapLayerType.observe(viewLifecycleOwner) { type ->
             Log.d("UnitMapFragment", "Loading layer!")
-            unitsMapFragment.updateTile(layer)
+            unitsMapFragment.updateLayer(type)
+            unitsViewModel.selectedUnit.value?.let {
+                unitsMapFragment.focusOn(it.position!!.latitude!!, it.position!!.longitude!!)
+            }
+            val layer = MapLayer.layers[type]!!
             binding.attributionText.text = HtmlCompat.fromHtml(layer.attribution, 0)
         }
 
@@ -113,7 +117,7 @@ class UnitMapFragment(private val unitsViewModel: UnitsViewModel) : UnitFragment
         Log.d("UnitMapFragment", "removeObservers()")
         unitsViewModel.units.removeObservers(viewLifecycleOwner)
         unitsViewModel.selectedUnit.removeObservers(viewLifecycleOwner)
-        unitsViewModel.mapLayer.removeObservers(viewLifecycleOwner)
+        unitsViewModel.mapLayerType.removeObservers(viewLifecycleOwner)
         unitsViewModel.geofences.removeObservers(viewLifecycleOwner)
     }