From 6169aaf5c3bb1ea2fcb010ad0d47afc97cbb04b7 Mon Sep 17 00:00:00 2001
From: Norbert Renner <norbert.renner@gmx.de>
Date: Mon, 16 Dec 2019 12:27:40 +0100
Subject: [PATCH] Update JOSM layers after updating Maps Wiki

- Waymarked Trails z18
- German Style URL without "tiles/osmde" path
also getting:
- Hungary hiking with new URL and now as overlay
- CyclOSM production URL
---
 layers/config/tree.js                         | 8 ++++++--
 layers/josm/OpenStreetMap-turistautak.geojson | 3 ++-
 layers/josm/Waymarked_Trails-Cycling.geojson  | 2 +-
 layers/josm/Waymarked_Trails-Hiking.geojson   | 2 +-
 layers/josm/Waymarked_Trails-MTB.geojson      | 2 +-
 layers/josm/cyclosm.geojson                   | 2 +-
 layers/josm/osm-mapnik-german_style.geojson   | 2 +-
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/layers/config/tree.js b/layers/config/tree.js
index 456bcdf..f9f10c3 100644
--- a/layers/config/tree.js
+++ b/layers/config/tree.js
@@ -40,7 +40,6 @@ BR.confLayers.tree = {
             },
             'OpenStreetMap.CH',
             'topplus-open',
-            'OpenStreetMap-turistautak',
             {
                 'IL': [
                     'Israel_Hiking',
@@ -70,7 +69,12 @@ BR.confLayers.tree = {
         ],
         'country': [
             'historic-place-contours',
-            'hu-hillshade',
+            {
+                'HU': [
+                    'hu-hillshade',
+                    'OpenStreetMap-turistautak',
+                ]
+            },
             {
                 'PL': [
                     'mapaszlakow-cycle',
diff --git a/layers/josm/OpenStreetMap-turistautak.geojson b/layers/josm/OpenStreetMap-turistautak.geojson
index 17c0685..db46923 100644
--- a/layers/josm/OpenStreetMap-turistautak.geojson
+++ b/layers/josm/OpenStreetMap-turistautak.geojson
@@ -2310,8 +2310,9 @@
     "max_zoom": 18,
     "min_zoom": 0,
     "name": "OpenStreetMap Hungary (hiking routes)",
+    "overlay": true,
     "type": "tms",
-    "url": "http://{switch:h,i,j}.tile.openstreetmap.hu/turistautak/{zoom}/{x}/{y}.png",
+    "url": "https://{switch:a,b,c}.tile.openstreetmap.hu/tt/{zoom}/{x}/{y}.png",
     "valid-georeference": true,
     "dataSource": "JOSM"
   },
diff --git a/layers/josm/Waymarked_Trails-Cycling.geojson b/layers/josm/Waymarked_Trails-Cycling.geojson
index f61fa31..39073ac 100644
--- a/layers/josm/Waymarked_Trails-Cycling.geojson
+++ b/layers/josm/Waymarked_Trails-Cycling.geojson
@@ -8,7 +8,7 @@
     },
     "icon": "https://static.waymarkedtrails.org/img/map_cycling.png",
     "id": "Waymarked_Trails-Cycling",
-    "max_zoom": 17,
+    "max_zoom": 18,
     "name": "Waymarked Trails: Cycling",
     "overlay": true,
     "type": "tms",
diff --git a/layers/josm/Waymarked_Trails-Hiking.geojson b/layers/josm/Waymarked_Trails-Hiking.geojson
index f448206..d606305 100644
--- a/layers/josm/Waymarked_Trails-Hiking.geojson
+++ b/layers/josm/Waymarked_Trails-Hiking.geojson
@@ -8,7 +8,7 @@
     },
     "icon": "https://static.waymarkedtrails.org/img/map_hiking.png",
     "id": "Waymarked_Trails-Hiking",
-    "max_zoom": 17,
+    "max_zoom": 18,
     "name": "Waymarked Trails: Hiking",
     "overlay": true,
     "type": "tms",
diff --git a/layers/josm/Waymarked_Trails-MTB.geojson b/layers/josm/Waymarked_Trails-MTB.geojson
index eb522aa..da74d33 100644
--- a/layers/josm/Waymarked_Trails-MTB.geojson
+++ b/layers/josm/Waymarked_Trails-MTB.geojson
@@ -8,7 +8,7 @@
     },
     "icon": "https://static.waymarkedtrails.org/img/map_mtb.png",
     "id": "Waymarked_Trails-MTB",
-    "max_zoom": 17,
+    "max_zoom": 18,
     "name": "Waymarked Trails: MTB",
     "overlay": true,
     "type": "tms",
diff --git a/layers/josm/cyclosm.geojson b/layers/josm/cyclosm.geojson
index 50a4fb0..a1e79a0 100644
--- a/layers/josm/cyclosm.geojson
+++ b/layers/josm/cyclosm.geojson
@@ -12,7 +12,7 @@
     "mod-tile-features": true,
     "name": "CyclOSM",
     "type": "tms",
-    "url": "https://dev.{switch:a,b,c}.tile.openstreetmap.fr/cyclosm/{zoom}/{x}/{y}.png",
+    "url": "https://{switch:a,b,c}.tile-cyclosm.openstreetmap.fr/cyclosm/{zoom}/{x}/{y}.png",
     "valid-georeference": true,
     "dataSource": "JOSM"
   },
diff --git a/layers/josm/osm-mapnik-german_style.geojson b/layers/josm/osm-mapnik-german_style.geojson
index 5d7060a..46a114e 100644
--- a/layers/josm/osm-mapnik-german_style.geojson
+++ b/layers/josm/osm-mapnik-german_style.geojson
@@ -12,7 +12,7 @@
     "mod-tile-features": true,
     "name": "OpenStreetMap (German Style)",
     "type": "tms",
-    "url": "https://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png",
+    "url": "https://{switch:a,b,c,d}.tile.openstreetmap.de/{zoom}/{x}/{y}.png",
     "valid-georeference": true,
     "dataSource": "JOSM"
   },