From 9270050dfc0e4d42863a67bb2570d32d08a85ab2 Mon Sep 17 00:00:00 2001
From: RPJosh <RPJosh@rpjosh.de>
Date: Sun, 7 Jul 2024 13:16:29 +0200
Subject: [PATCH] Remove deprecated maps and add google satellite

---
 css/leaflet.css                | 10 ++++++
 lib/Controller/TileServers.php | 58 +++++++++++-----------------------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/css/leaflet.css b/css/leaflet.css
index a13c778..f52d7cf 100644
--- a/css/leaflet.css
+++ b/css/leaflet.css
@@ -630,3 +630,13 @@
 	margin-left: -12px;
 	border-right-color: #fff;
 	}
+
+
+section.leaflet-control-layers-list label span {
+	display: flex;
+	gap: .4rem;
+	align-items: center;
+}
+section.leaflet-control-layers-list label span input.leaflet-control-layers-selector {
+	height: 1.3rem;
+}
\ No newline at end of file
diff --git a/lib/Controller/TileServers.php b/lib/Controller/TileServers.php
index 6615ef4..bded77a 100644
--- a/lib/Controller/TileServers.php
+++ b/lib/Controller/TileServers.php
@@ -69,33 +69,6 @@ $baseTileServers = [
         'minzoom' => '1',
         'maxzoom' => '18'
     ),
-    Array(
-        'name' => 'Hike & bike',
-        'type' => 'tile',
-        'url' => 'http://a.tiles.wmflabs.org/hikebike/{z}/{x}/{y}.png',
-        'attribution' => 'Map data &copy; 2013 <a href="http://openstreetmap.org">OpenStreetMap</a> contributors',
-        'minzoom' => '1',
-        'maxzoom' => '18'
-    ),
-    Array(
-        'name' => 'OpenStreetMap France',
-        'type' => 'tile',
-        'url' => 'https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png',
-        'attribution' => 'Map data &copy; 2013 <a href="http://openstreetmap.org">OpenStreetMap</a> contributors',
-        'minzoom' => '1',
-        'maxzoom' => '18'
-    ),
-    Array(
-        'name' => 'IGN France',
-        'type' => 'tile',
-        'url' => 'http://wxs.ign.fr/ljthe66m795pr2v2g8p7faxt/wmts?LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS' .
-            '&EXCEPTIONS=text/xml&FORMAT=image/jpeg' .
-            '&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal' .
-            '&TILEMATRIXSET=PM&TILEMATRIX={z}&TILECOL={x}&TILEROW={y}',
-        'attribution' => '&copy; <a href="http://www.ign.fr/">IGN-France</a>',
-        'minzoom' => '1',
-        'maxzoom' => '18'
-    ),
     Array(
         'name' => 'Dark',
         'type' => 'tile',
@@ -105,19 +78,6 @@ $baseTileServers = [
         'minzoom' => '1',
         'maxzoom' => '18'
     ),
-    Array(
-        'name' => 'WaterColor',
-        'type' => 'tile',
-        'url' => 'http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg',
-        'attribution' => '<a href="http://leafletjs.com" title="A JS library' .
-        ' for interactive maps">Leaflet</a> | © Map tiles by <a href="http://stamen' .
-        '.com">Stamen Design</a>, under <a href="http://creativecommons.org/license' .
-        's/by/3.0">CC BY 3.0</a>, Data by <a href="http://openstreetmap.org">OpenSt' .
-        'reetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0"' .
-        '>CC BY SA</a>.',
-        'minzoom' => '1',
-        'maxzoom' => '18'
-    ),
     Array(
         'name' => 'Toner',
         'type' => 'tile|overlay',
@@ -131,6 +91,24 @@ $baseTileServers = [
         'minzoom' => '1',
         'maxzoom' => '18'
     ),
+    Array(
+        'name' => 'Google Maps Sattellite',
+        'type' => 'tile',
+        'url' => 'https://mt.google.com/vt?lyrs=s&x={x}&y={y}&z={z}',
+        'attribution' => "<a href='http://maps.google.com/'>Google Maps</a> Satellite",
+        'minzoom' => '1',
+        'maxzoom' => '20'
+
+    ),
+    Array(
+        'name' => 'Google Maps Hybrid',
+        'type' => 'tile',
+        'url' => 'https://mt.google.com/vt?lyrs=y&x={x}&y={y}&z={z}',
+        'attribution' => "<a href='http://maps.google.com/'>Google Maps</a> Hybrid",
+        'minzoom' => '1',
+        'maxzoom' => '20'
+
+    ),
     Array(
         'name' => 'OsmFr Route500',
         'type' => 'overlay',