From ca0a8ae352853e20fd39fdca06ba4161ec830564 Mon Sep 17 00:00:00 2001
From: pathmapper <pathmapper@posteo.de>
Date: Thu, 8 Apr 2021 00:22:20 +0200
Subject: [PATCH] Use recommended osm tile url for server API - Features and
 landingpage (#42697)

* Use recommended osm tile url
---
 resources/server/api/ogc/templates/wfs3/describeCollection.html | 2 +-
 resources/server/api/ogc/templates/wfs3/leaflet_map.html        | 2 +-
 resources/server/src/landingpage/src/views/Catalog.vue          | 2 +-
 resources/server/src/landingpage/src/views/WebGis.vue           | 2 +-
 .../api/test_wfs3_collection_testlayer_\303\250\303\251.html"   | 2 +-
 ...test_wfs3_collections_items_testlayer_\303\250\303\251.html" | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/server/api/ogc/templates/wfs3/describeCollection.html b/resources/server/api/ogc/templates/wfs3/describeCollection.html
index 74b6ccc044ac..488df2074044 100644
--- a/resources/server/api/ogc/templates/wfs3/describeCollection.html
+++ b/resources/server/api/ogc/templates/wfs3/describeCollection.html
@@ -44,7 +44,7 @@ <h3>Links</h3>
         <script type="text/javascript">
         jQuery( document ).ready(function( $ ) {
             var map = L.map('mapid').setView([0, 0], 13);
-            L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
                 attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
             }).addTo(map)
             var west = {{ extent.spatial.bbox.0.0 }};
diff --git a/resources/server/api/ogc/templates/wfs3/leaflet_map.html b/resources/server/api/ogc/templates/wfs3/leaflet_map.html
index ebc4748b0d5f..50ef3bb593dc 100644
--- a/resources/server/api/ogc/templates/wfs3/leaflet_map.html
+++ b/resources/server/api/ogc/templates/wfs3/leaflet_map.html
@@ -5,7 +5,7 @@
     <script type="text/javascript">
     jQuery( document ).ready(function( $ ) {
         var map = L.map('mapid').setView([0, 0], 13);
-        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
             attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
         }).addTo(map)
         $.get( "{{ metadata.geojsonUrl }}", function( data ) {
diff --git a/resources/server/src/landingpage/src/views/Catalog.vue b/resources/server/src/landingpage/src/views/Catalog.vue
index 05c6dd1f49f7..164729630749 100644
--- a/resources/server/src/landingpage/src/views/Catalog.vue
+++ b/resources/server/src/landingpage/src/views/Catalog.vue
@@ -63,7 +63,7 @@
               @ready="loadMap(project, $event)"
             >
               <l-tile-layer
-                url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+                url="https://tile.openstreetmap.org/{z}/{x}/{y}.png"
                 v-if="
                   project.capabilities.wmsOutputCrsList.includes('EPSG:3857')
                 "
diff --git a/resources/server/src/landingpage/src/views/WebGis.vue b/resources/server/src/landingpage/src/views/WebGis.vue
index 402b17cc29b9..d6250cd8d151 100644
--- a/resources/server/src/landingpage/src/views/WebGis.vue
+++ b/resources/server/src/landingpage/src/views/WebGis.vue
@@ -45,7 +45,7 @@
             >
               <l-tile-layer
                 :visible="baseMap == 'openstreetmap'"
-                url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+                url="https://tile.openstreetmap.org/{z}/{x}/{y}.png"
                 v-if="
                   project &&
                   project.capabilities.wmsOutputCrsList.includes('EPSG:3857')
diff --git "a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_\303\250\303\251.html" "b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_\303\250\303\251.html"
index b32ef2716e9a..715a6a80f879 100644
--- "a/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_\303\250\303\251.html"
+++ "b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_\303\250\303\251.html"
@@ -131,7 +131,7 @@ <h3>Links</h3>
         <script type="text/javascript">
         jQuery( document ).ready(function( $ ) {
             var map = L.map('mapid').setView([0, 0], 13);
-            L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
                 attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
             }).addTo(map)
             var west = 8.203459307036344;
diff --git "a/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_\303\250\303\251.html" "b/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_\303\250\303\251.html"
index 9f99d1521003..f61599305408 100644
--- "a/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_\303\250\303\251.html"
+++ "b/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_\303\250\303\251.html"
@@ -126,7 +126,7 @@ <h2><a href="http://server.qgis.org/wfs3/collections/testlayer èé/items/2.html
     <script type="text/javascript">
     jQuery( document ).ready(function( $ ) {
         var map = L.map('mapid').setView([0, 0], 13);
-        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
             attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
         }).addTo(map)
         $.get( "http://server.qgis.org/wfs3/collections/testlayer%20%C3%A8%C3%A9/items.geojson", function( data ) {