Merge pull request #42722 from pathmapper/backport-42697-to-release-3_16

[Backport release-3_16] Use recommended osm tile url for server API - Features and landingpage
qgis · Apr 8, 2021 · 0dd9b67 · 0dd9b67
2 parents c1b0036 + 97faffe
commit 0dd9b67
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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_èé.html b/tests/testdata/qgis_server/api/test_wfs3_collection_testlayer_èé.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_èé.html b/tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé.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 ) {