Switch to default OSS layers

dainst · Oct 14, 2024 · 00c1cae · 00c1cae
1 parent 3cf769a
commit 00c1cae
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git a/frontend/app/con10t-widgets/network/con10t-network-map.directive.js b/frontend/app/con10t-widgets/network/con10t-network-map.directive.js
@@ -20,8 +20,8 @@ export default function($compile, transl8) {
                 zoomAnimation: false});
 
             L.tileLayer(
-                'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
-                { attribution: 'Maps &copy; Thunderforest, Data &copy; OpenStreetMap contributors' })
+                'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+                { attribution: 'Maps and Data &copy; <a href="https://osmfoundation.org/wiki/Licence">OpenStreetMap</a>.' })
                 .addTo(scope.map);
 
             scope.placeLayer = new L.LayerGroup().addTo(scope.map);

diff --git a/frontend/app/map/ar-entity-map.directive.js b/frontend/app/map/ar-entity-map.directive.js
@@ -38,7 +38,9 @@ export default function($compile, Query, placesPainter) {
             });
             // / Disable dragging functionality if outside of container bounds
 
-            var layer = L.tileLayer('http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87', {
+            var layer = L.tileLayer(
+                'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+                { attribution: 'Maps and Data &copy; <a href="https://osmfoundation.org/wiki/Licence">OpenStreetMap</a>.' }, {
                 maxZoom: 18,
                 minZoom: 2
             });

diff --git a/frontend/app/map/map.service.js b/frontend/app/map/map.service.js
@@ -20,10 +20,10 @@ export default function(searchService) {
         'osm': {
             'name': 'OpenStreetMap',
             'type': 'xyz',
-            'url': 'https://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
+            'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
             'layerOptions': {
                 'subdomains': ['a', 'b', 'c'],
-                'attribution': '&copy; <a href=\'https://www.opencyclemap.org\'>OpenCycleMap</a>, &copy; <a href=\'https://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
+                'attribution': 'Maps and Data &copy; <a href="https://osmfoundation.org/wiki/Licence">OpenStreetMap</a>.',
                 'continuousWorld': false,
                 'maxZoom': 18
             }

diff --git a/frontend/con10t/ar/hinkel_map.html b/frontend/con10t/ar/hinkel_map.html
@@ -64,10 +64,10 @@
     osm: {
         'name': 'OpenStreetMap',
         'type': 'xyz',
-        'url': 'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
+        'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png/{z}/{x}/{y}.png',
         'yayerOptions': {
             'subdomains': ['a', 'b', 'c'],
-            'attribution': '&copy; <a href=\'http://www.opencyclemap.org\'>OpenCycleMap</a>, &copy; <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
+            'attribution': 'Maps and Data &copy; <a href=\'https://osmfoundation.org/wiki/Licence\'>OpenStreetMap</a>.'',
             'continuousWorld': false,
             'maxZoom': 18
         }

diff --git a/frontend/con10t/de/ceramegypt.html b/frontend/con10t/de/ceramegypt.html
@@ -43,7 +43,7 @@ <h3>Map view</h3>
 						osm: {
 							name: 'OpenStreetMap',
 							type: 'xyz',
-							url: 'https://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png',
+							url: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png/{z}/{x}/{y}.png',
 							layerOptions: {
 								subdomains: ['a', 'b', 'c'],
 								attribution: '<a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',

diff --git a/frontend/con10t/de/hinkel_map.html b/frontend/con10t/de/hinkel_map.html
@@ -64,10 +64,10 @@
     osm: {
         'name': 'OpenStreetMap',
         'type': 'xyz',
-        'url': 'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
+        'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
         'layerOptions': {
             'subdomains': ['a', 'b', 'c'],
-            'attribution': '&copy; <a href=\'http://www.opencyclemap.org\'>OpenCycleMap</a>, &copy; <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
+            'attribution': ''Maps and Data &copy; <a href=\'https://osmfoundation.org/wiki/Licence\'>OpenStreetMap</a>.'',
             'continuousWorld': false,
             'maxZoom': 18
         }

diff --git a/frontend/con10t/en/ceramegypt.html b/frontend/con10t/en/ceramegypt.html
@@ -43,7 +43,7 @@ <h3>Map view</h3>
 						osm: {
 							name: 'OpenStreetMap',
 							type: 'xyz',
-							url: 'https://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png',
+							url: 'http://{s}.https://tile.openstreetmap.org/{z}/{x}/{y}.png/{z}/{x}/{y}.png',
 							layerOptions: {
 								subdomains: ['a', 'b', 'c'],
 								attribution: '<a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',

diff --git a/frontend/con10t/en/hinkel_map.html b/frontend/con10t/en/hinkel_map.html
@@ -64,10 +64,10 @@
     osm: {
         'name': 'OpenStreetMap',
         'type': 'xyz',
-        'url': 'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=b47a3cf895b94aedad41e5cfb5222b87',
+        'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
         'yayerOptions': {
             'subdomains': ['a', 'b', 'c'],
-            'attribution': '&copy; <a href=\'http://www.opencyclemap.org\'>OpenCycleMap</a>, &copy; <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors',
+            'attribution': 'Maps and Data &copy; <a href=\'https://osmfoundation.org/wiki/Licence\'>OpenStreetMap</a>.',
             'continuousWorld': false,
             'maxZoom': 18
         }