From 45707b4840fe4183f10a4990a1e3fae30afd6809 Mon Sep 17 00:00:00 2001
From: Johannes Visintini <johannes.visintini@uni-heidelberg.de>
Date: Mon, 11 Feb 2019 15:43:59 +0100
Subject: [PATCH 1/2] Changed parameters of moved mapsurfer maps

Details see also http://k1z.blog.uni-heidelberg.de/2019/02/08/the-future-of-openmapsurfers-tiles
---
 src/data_sources/mapsurfer_contour_lines/metadata.ini         | 4 ++--
 src/data_sources/mapsurfer_hillshade/metadata.ini             | 4 ++--
 .../mapsurfer_osm_ administrative_boundaries/metadata.ini     | 4 ++--
 src/data_sources/mapsurfer_osm_roads/metadata.ini             | 2 +-
 src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini   | 4 ++--
 src/data_sources/mapsurfer_osm_semitransparent/metadata.ini   | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/data_sources/mapsurfer_contour_lines/metadata.ini b/src/data_sources/mapsurfer_contour_lines/metadata.ini
index 959d1ae..92164af 100644
--- a/src/data_sources/mapsurfer_contour_lines/metadata.ini
+++ b/src/data_sources/mapsurfer_contour_lines/metadata.ini
@@ -14,9 +14,9 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =ASTER GDEM is a product of METI and NASA, Imagery GIScience Research Group @ Heidelberg University
 copyright_link = https://lpdaac.usgs.gov/products/aster_policies;
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/asterc/x={x}&y={y}&z={z}
+url = http://korona.geog.uni-heidelberg.de/tiles/asterc/x={x}&y={y}&z={z} # TODO
 zmin = 13
 zmax = 17
diff --git a/src/data_sources/mapsurfer_hillshade/metadata.ini b/src/data_sources/mapsurfer_hillshade/metadata.ini
index fca31c0..c55462f 100644
--- a/src/data_sources/mapsurfer_hillshade/metadata.ini
+++ b/src/data_sources/mapsurfer_hillshade/metadata.ini
@@ -14,8 +14,8 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =SRTM, ASTER GDEM is a product of METI and NASA, Imagery GIScience Research Group @ Heidelberg University
 copyright_link = http://srtm.csi.cgiar.org/; https://lpdaac.usgs.gov/products/aster_policies;
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/asterh/x={x}&y={y}&z={z}
+url = https://maps.heigit.org/openmapsurfer/tiles/asterh/webmercator/{z}/{x}/{y}.png
 #zmax = 19
diff --git a/src/data_sources/mapsurfer_osm_ administrative_boundaries/metadata.ini b/src/data_sources/mapsurfer_osm_ administrative_boundaries/metadata.ini
index 594b387..0739711 100644
--- a/src/data_sources/mapsurfer_osm_ administrative_boundaries/metadata.ini	
+++ b/src/data_sources/mapsurfer_osm_ administrative_boundaries/metadata.ini	
@@ -14,8 +14,8 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =©OpenStreetMap contributors, ODbL, Imagery GIScience Research Group @ Heidelberg University
 copyright_link = https://www.openstreetmap.org/copyright
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/adminb/x={x}&y={y}&z={z}
+url = https://maps.heigit.org/openmapsurfer/tiles/adminb/webmercator/{z}/{x}/{y}.png
 #zmax = 19
diff --git a/src/data_sources/mapsurfer_osm_roads/metadata.ini b/src/data_sources/mapsurfer_osm_roads/metadata.ini
index d7e4551..a12127a 100644
--- a/src/data_sources/mapsurfer_osm_roads/metadata.ini
+++ b/src/data_sources/mapsurfer_osm_roads/metadata.ini
@@ -14,7 +14,7 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =©OpenStreetMap contributors, ODbL, Imagery GIScience Research Group @ Heidelberg University
 copyright_link = https://www.openstreetmap.org/copyright
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
 url = https://maps.heigit.org/openmapsurfer/tiles/roads/webmercator/{z}/{x}/{y}.png
diff --git a/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini b/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini
index 15ebdf0..c05c084 100644
--- a/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini
+++ b/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini
@@ -14,8 +14,8 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =© OpenStreetMap contributors, CC-BY-SA
 copyright_link = https://www.openstreetmap.org/copyright
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/roadsg/x={x}&y={y}&z={z}
+url = http://korona.geog.uni-heidelberg.de/tiles/roadsg/x={x}&y={y}&z={z} # TODO
 #zmax = 19
diff --git a/src/data_sources/mapsurfer_osm_semitransparent/metadata.ini b/src/data_sources/mapsurfer_osm_semitransparent/metadata.ini
index 0f5aeb2..69eb248 100644
--- a/src/data_sources/mapsurfer_osm_semitransparent/metadata.ini
+++ b/src/data_sources/mapsurfer_osm_semitransparent/metadata.ini
@@ -14,8 +14,8 @@ name = CC-BY-SA 2.0
 link = http://creativecommons.org/licenses/by-sa/2.0/
 copyright_text =©OpenStreetMap contributors, ODbL, Imagery GIScience Research Group @ Heidelberg University
 copyright_link = https://www.openstreetmap.org/copyright
-terms_of_use = http://korona.geog.uni-heidelberg.de/contact.html
+terms_of_use = https://openrouteservice.org/terms-of-service
 
 [tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/hybrid/x={x}&y={y}&z={z}
+url = https://maps.heigit.org/openmapsurfer/tiles/hybrid/webmercator/{z}/{x}/{y}.png
 #zmax = 19

From 9b933da355228ab643ceac18535478e92bd7903b Mon Sep 17 00:00:00 2001
From: Johannes Visintini <johannes.visintini@uni-heidelberg.de>
Date: Mon, 11 Feb 2019 18:07:23 +0100
Subject: [PATCH 2/2] removed old and fix typo in foldername

---
 .../mapsurfer_contour_lines/metadata.ini      |  22 ------------------
 .../mapsurfer.png                             | Bin 11804 -> 0 bytes
 .../mapsurfer.png                             | Bin
 .../metadata.ini                              |   0
 .../mapsurfer.png                             | Bin 11804 -> 0 bytes
 .../metadata.ini                              |  21 -----------------
 6 files changed, 43 deletions(-)
 delete mode 100644 src/data_sources/mapsurfer_contour_lines/metadata.ini
 delete mode 100644 src/data_sources/mapsurfer_osm_ administrative_boundaries/mapsurfer.png
 rename src/data_sources/{mapsurfer_contour_lines => mapsurfer_osm_administrative_boundaries}/mapsurfer.png (100%)
 rename src/data_sources/{mapsurfer_osm_ administrative_boundaries => mapsurfer_osm_administrative_boundaries}/metadata.ini (100%)
 delete mode 100644 src/data_sources/mapsurfer_osm_roads_grayscale/mapsurfer.png
 delete mode 100644 src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini

diff --git a/src/data_sources/mapsurfer_contour_lines/metadata.ini b/src/data_sources/mapsurfer_contour_lines/metadata.ini
deleted file mode 100644
index 92164af..0000000
--- a/src/data_sources/mapsurfer_contour_lines/metadata.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[general]
-id = mapsurfer_countiur_lines
-type = TMS
-is_contrib = False
-
-[ui]
-group = mapsurfer
-alias = MapSurfer ASTER GDEM contour lines
-alias[ru] = MapSurfer Изолинии рельефа (ASTER GDEM)
-icon = mapsurfer.png
-
-[license]
-name = CC-BY-SA 2.0
-link = http://creativecommons.org/licenses/by-sa/2.0/
-copyright_text =ASTER GDEM is a product of METI and NASA, Imagery GIScience Research Group @ Heidelberg University
-copyright_link = https://lpdaac.usgs.gov/products/aster_policies;
-terms_of_use = https://openrouteservice.org/terms-of-service
-
-[tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/asterc/x={x}&y={y}&z={z} # TODO
-zmin = 13
-zmax = 17
diff --git a/src/data_sources/mapsurfer_osm_ administrative_boundaries/mapsurfer.png b/src/data_sources/mapsurfer_osm_ administrative_boundaries/mapsurfer.png
deleted file mode 100644
index ef2bcb1304ef31f334e33b365cf12d11097fa0a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11804
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
KMNUMnLSTYtig)Ay

diff --git a/src/data_sources/mapsurfer_contour_lines/mapsurfer.png b/src/data_sources/mapsurfer_osm_administrative_boundaries/mapsurfer.png
similarity index 100%
rename from src/data_sources/mapsurfer_contour_lines/mapsurfer.png
rename to src/data_sources/mapsurfer_osm_administrative_boundaries/mapsurfer.png
diff --git a/src/data_sources/mapsurfer_osm_ administrative_boundaries/metadata.ini b/src/data_sources/mapsurfer_osm_administrative_boundaries/metadata.ini
similarity index 100%
rename from src/data_sources/mapsurfer_osm_ administrative_boundaries/metadata.ini
rename to src/data_sources/mapsurfer_osm_administrative_boundaries/metadata.ini
diff --git a/src/data_sources/mapsurfer_osm_roads_grayscale/mapsurfer.png b/src/data_sources/mapsurfer_osm_roads_grayscale/mapsurfer.png
deleted file mode 100644
index ef2bcb1304ef31f334e33b365cf12d11097fa0a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11804
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
KMNUMnLSTYtig)Ay

diff --git a/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini b/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini
deleted file mode 100644
index c05c084..0000000
--- a/src/data_sources/mapsurfer_osm_roads_grayscale/metadata.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[general]
-id = mapsurfer_osm_roads_grayscale
-type = TMS
-is_contrib = False
-
-[ui]
-group = mapsurfer
-alias = MapSurfer OSM Roads Grayscale
-alias[ru] = Базовая карта MapSurfer ч/б
-icon = mapsurfer.png
-
-[license]
-name = CC-BY-SA 2.0
-link = http://creativecommons.org/licenses/by-sa/2.0/
-copyright_text =© OpenStreetMap contributors, CC-BY-SA
-copyright_link = https://www.openstreetmap.org/copyright
-terms_of_use = https://openrouteservice.org/terms-of-service
-
-[tms]
-url = http://korona.geog.uni-heidelberg.de/tiles/roadsg/x={x}&y={y}&z={z} # TODO
-#zmax = 19