From f8e7e755dc8e557e1e5b9e9be318f8415a2c7f8e Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sun, 16 Jan 2022 02:58:04 -0600
Subject: Moved layer definitions to map_layers.xml and adjusted zoom limits,
 and adjusted zoomLevelToScale(zoom)

---
 androidApp/src/main/res/values/map_layers.xml | 23 +++++++++++++++++++++++
 androidApp/src/main/res/values/strings.xml    | 18 ------------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 androidApp/src/main/res/values/map_layers.xml

(limited to 'androidApp/src/main/res/values')

diff --git a/androidApp/src/main/res/values/map_layers.xml b/androidApp/src/main/res/values/map_layers.xml
new file mode 100644
index 0000000..c0e83a5
--- /dev/null
+++ b/androidApp/src/main/res/values/map_layers.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Tile URLs -->
+    <!-- [0] = tile server URL -->
+    <!-- [1] = min zoom -->
+    <!-- [2] = max zoom -->
+    <!-- [3] = attribution text -->
+
+    <string-array name="maps_streets_tile_url" translatable="false">
+        <item>https://a.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png</item>
+        <item>0</item>
+        <item>21</item>
+        <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_satellite_tile_url" translatable="false">
+        <item>https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}</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>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index 67f0a26..a3d2f28 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -10,24 +10,6 @@
         https://www.google.com/maps/place/%1$f,%2$f?z=19
     </string>
 
-    <!-- Tile URLs -->
-    <!-- [0] = tile server URL -->
-    <!-- [1] = min zoom -->
-    <!-- [2] = max zoom -->
-    <!-- [3] = attribution text -->
-    <string-array name="maps_streets_tile_url" translatable="false">
-        <item>https://a.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png</item>
-        <item>0</item>
-        <item>20</item>
-        <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_satellite_tile_url" translatable="false">
-        <item>https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}</item>
-        <item>0</item>
-        <item>17</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>
-    </string-array>
-
     <string name="notification_channel_id" translatable="false">default</string>
     <string name="notification_channel" translatable="false">Default</string>
 
-- 
cgit v1.2.3