From c8d423b0933b21c9e16475f9bf89160fc8861825 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Mon, 17 Jan 2022 01:11:04 -0600
Subject: Branded merge

---
 .../mx/trackermap/TrackerMap/client/models/MapLayer.kt  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'shared/src/commonMain/kotlin')

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 ff0489e..4a48952 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
@@ -8,7 +8,8 @@ data class MapLayer(
 ) {
     enum class Type {
         STREETS,
-        SATELLITE
+        GMAPS_STREETS,
+        GMAPS_SATELLITE
     }
 
     companion object {
@@ -19,11 +20,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"
             )
         )
 
-- 
cgit v1.2.3