update basemap URL across all configurations (#1777) (#1778)

* update basemap URL across all configurations (#1777)

* update basemap URL across all configurations (#1777)

docker/default.config.yml

@@ -48,8 +48,8 @@ server:
     limit: 10
     # templates: /path/to/templates
     map:
-        url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+        url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-        attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
     ogc_schemas_location: /schemas.opengis.net
 
 logging:

docs/source/configuration.rst

@@ -57,8 +57,8 @@ For more information related to API design rules (the ``api_rules`` property in
       static: /path/to/static/folder # path to static folder containing css, js, images and other static files referenced by the template
 
     map:  # leaflet map setup for HTML pages
-        url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+        url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-        attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
     ogc_schemas_location: /opt/schemas.opengis.net  # local copy of https://schemas.opengis.net
 
     manager:  # optional OGC API - Processes asynchronous job management

tests/data/admin/admin-put.json

@@ -13,8 +13,8 @@
       "pretty_print": true,
       "limit": 10,
       "map": {
-        "url": "https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png",
+        "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
-        "attribution": "<a href=\"https://wikimediafoundation.org/wiki/Maps_Terms_of_Use\">Wikimedia maps</a> | Map data &copy; <a href=\"https://openstreetmap.org/copyright\">OpenStreetMap contributors</a>"
+        "attribution": "&copy; <a href=\"https://openstreetmap.org/copyright\">OpenStreetMap contributors</a>"
       }
     },
     "logging": {
@@ -69,4 +69,4 @@
       }
     }
   }
-  
+  

tests/pygeoapi-test-config-admin.yml

@@ -41,10 +41,8 @@ server:
     pretty_print: true
     limit: 10
     map:
-        url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+        url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-        attribution: <a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
-            maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap
-            contributors</a>
     # manager:
     #     name: TinyDB
     #     connection: /tmp/pygeoapi-process-manager.db

tests/pygeoapi-test-config-apirules.yml

@@ -46,8 +46,8 @@ server:
     limit: 10
     # templates: /path/to/templates
     map:
-        url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+        url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-        attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
     manager:
         name: TinyDB
         connection: /tmp/pygeoapi-test-process-manager.db

tests/pygeoapi-test-config-enclosure.yml

@@ -44,8 +44,8 @@ server:
     limit: 10
     # templates: /path/to/templates
     map:
-        url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+        url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-        attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
     manager:
         name: TinyDB
         connection: /tmp/pygeoapi-test-process-manager.db

tests/pygeoapi-test-config-envvars.yml

@@ -41,8 +41,8 @@ server:
     limit: 10
     # templates: /path/to/templates
     map:
-        url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+        url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-        attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
 
 logging:
     level: DEBUG

tests/pygeoapi-test-config-hidden-resources.yml

@@ -44,8 +44,8 @@ server:
     limit: 10
     # templates: /path/to/templates
     map:
-        url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+        url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-        attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
     manager:
         name: TinyDB
         connection: /tmp/pygeoapi-test-process-manager.db

tests/pygeoapi-test-config-ogr.yml

@@ -41,8 +41,8 @@ server:
   limit: 10
   # templates: /path/to/templates
   map:
-    url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+    url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-    attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+    attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
 
 logging:
   level: DEBUG

tests/pygeoapi-test-config-postgresql-manager.yml

@@ -44,8 +44,8 @@ server:
     limit: 10
     # templates: /path/to/templates
     map:
-        url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+        url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-        attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
     manager:
         name: PostgreSQL
         connection:

tests/pygeoapi-test-config.yml

@@ -44,8 +44,8 @@ server:
     limit: 10
     # templates: /path/to/templates
     map:
-        url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
+        url: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-        attribution: '<a href="https://wikimediafoundation.org/wiki/Maps_Terms_of_Use">Wikimedia maps</a> | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        attribution: '&copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
     manager:
         name: TinyDB
         connection: /tmp/pygeoapi-test-process-manager.db