From 4f4b7f5755c164d4d9c3c4cc35118cf3429874c6 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sun, 16 Jan 2022 04:26:31 -0600
Subject: Added Google Maps and Google Satellites layers

---
 .../TrackerMap/android/units/UnitsActivity.kt          |  1 +
 androidApp/src/main/res/menu/map_layers.xml            |  4 ++++
 androidApp/src/main/res/values-es-rMX/map_layers.xml   |  5 +++--
 androidApp/src/main/res/values/map_layers.xml          | 18 +++++++++++++-----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
index 1bbcb80..f2ff30e 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
@@ -94,6 +94,7 @@ class UnitsActivity : AppCompatActivity() {
             val layer = resources.getStringArray(
                 when (item.itemId) {
                     R.id.layerStreets -> R.array.maps_streets_tile
+                    R.id.layerGmaps -> R.array.maps_gmaps_tile
                     R.id.layerSatellite -> R.array.maps_satellite_tile
                     else -> R.array.maps_streets_tile
                 }
diff --git a/androidApp/src/main/res/menu/map_layers.xml b/androidApp/src/main/res/menu/map_layers.xml
index 334b9f9..46165da 100644
--- a/androidApp/src/main/res/menu/map_layers.xml
+++ b/androidApp/src/main/res/menu/map_layers.xml
@@ -6,6 +6,10 @@
         android:id="@+id/layerStreets"
         android:title="@string/layer_streets"/>
 
+    <item
+        android:id="@+id/layerGmaps"
+        android:title="@string/layer_gmaps"/>
+
     <item
         android:id="@+id/layerSatellite"
         android:title="@string/layer_satellite"/>
diff --git a/androidApp/src/main/res/values-es-rMX/map_layers.xml b/androidApp/src/main/res/values-es-rMX/map_layers.xml
index eff37d9..ef56b76 100644
--- a/androidApp/src/main/res/values-es-rMX/map_layers.xml
+++ b/androidApp/src/main/res/values-es-rMX/map_layers.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="layer_streets">Calles</string>
-    <string name="layer_satellite">Satélite</string>
+    <string name="layer_streets">OpenStreetMap</string>
+    <string name="layer_gmaps">Google Calles</string>
+    <string name="layer_satellite">Google Satélite</string>
 </resources>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values/map_layers.xml b/androidApp/src/main/res/values/map_layers.xml
index bffceb9..59c6af5 100644
--- a/androidApp/src/main/res/values/map_layers.xml
+++ b/androidApp/src/main/res/values/map_layers.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="layer_streets">Streets</string>
-    <string name="layer_satellite">Satellite</string>
+    <string name="layer_streets">OpenStreetMap</string>
+    <string name="layer_gmaps">Google Streets</string>
+    <string name="layer_satellite">Google Satellite</string>
 
     <!-- Tile URLs -->
     <!-- [0] = tile server URL -->
@@ -16,11 +17,18 @@
         <item>&#169; OpenStreetMap France | &#169; &lt;a href="https://www.openstreetmap.org/copyright"&gt;OpenStreetMap&lt;/a&gt; contributors</item>
     </string-array>
 
+    <string-array name="maps_gmaps_tile" translatable="false">
+        <item>https://mt0.google.com/vt/lyrs=m&amp;hl=en&amp;x={x}&amp;y={y}&amp;z={z}&amp;s=Ga</item>
+        <item>0</item>
+        <item>21</item>
+        <item>&#169; Google</item>
+    </string-array>
+
     <string-array name="maps_satellite_tile" translatable="false">
-        <item>https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}</item>
+        <item>https://mt0.google.com/vt/lyrs=y&amp;hl=en&amp;x={x}&amp;y={y}&amp;z={z}&amp;s=Ga</item>
         <item>0</item>
-        <item>20</item>
-        <item>Tiles &#169; Esri &#8212; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community</item>
+        <item>21</item>
+        <item>&#169; Google</item>
     </string-array>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3