Merged 'main' branch and solved conflicts.

1 files changed, 12 insertions, 5 deletions

diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt
index 3266c0b..7bb41ae 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/MapLayer.kt
@@ -25,7 +25,8 @@ data class MapLayer(
 ) {
     enum class Type {
         STREETS,
-        SATELLITE
+        GMAPS_STREETS,
+        GMAPS_SATELLITE
     }
 
     companion object {
@@ -36,11 +37,17 @@ data class MapLayer(
                 maxZoom = 23,
                 attribution = "&#169; OpenStreetMap France | &#169; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
             ),
-            Type.SATELLITE to MapLayer(
-                url = "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
+            Type.GMAPS_STREETS to MapLayer(
+                url = "https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga",
                 minZoom = 1,
-                maxZoom = 20,
-                attribution = "Tiles &#169; Esri &#8212; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
+                maxZoom = 23,
+                attribution = "&#169; Google"
+            ),
+            Type.GMAPS_SATELLITE to MapLayer(
+                url = "https://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Ga",
+                minZoom = 1,
+                maxZoom = 23,
+                attribution = "&#169; Google"
             )
         )