1 files changed, 12 insertions, 11 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 e30885d..c4e5fc8 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
@@ -18,6 +18,7 @@ import mil.nga.sf.wkt.GeometryReader
 import java.io.File
 import mx.trackermap.TrackerMap.android.R
 import mx.trackermap.TrackerMap.client.models.Geofence
+import mx.trackermap.TrackerMap.client.models.MapLayer
 import mx.trackermap.TrackerMap.utils.MapCalculus
 import mx.trackermap.TrackerMap.utils.MarkerType
 
@@ -59,7 +60,8 @@ class MapFragment : GlobeMapFragment() {
         Log.d("MapFragment", "controlHasStarted")
 
         if (tileInfo == null) {
-            val layer = resources.getStringArray(R.array.maps_streets_tile_url)
+            // 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)
             tileInfo?.let {
@@ -344,6 +346,15 @@ class MapFragment : GlobeMapFragment() {
         }
     }
 
+    fun updateTileInfo(layer: MapLayer) {
+        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)
+        }
+    }
+
     private fun setZoomLimits(minZoom: Int, maxZoom: Int) {
         mapControl?.let {
             it.setZoomLimits(
@@ -359,16 +370,6 @@ class MapFragment : GlobeMapFragment() {
         }
     }
 
-    fun updateTileInfo(url: String, tileInfo: TileInfoNew) {
-        context?.let {
-            this.tileInfo = tileInfoSetCacheDir(url, tileInfo)
-            this.tileInfo?.let {
-                loader?.changeTileInfo(it)
-                setZoomLimits(tileInfo.minZoom, tileInfo.maxZoom)
-            }
-        }
-    }
-
     private fun getIcon(markerType: MarkerType): Bitmap {
         return ResourcesCompat.getDrawable(
             activity!!.resources,