Merge PR #138 from geopython/map-url-config

map url config and attribution

aws-lambda/pygeoapi-serverless-config.yml

@@ -10,6 +10,9 @@ server:
     pretty_print: true
     limit: 10
     # templates: /path/to/templates
+    map:
+        url: https://maps.wikimedia.org/osm-intl/{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>'
 
 logging:
     level: ERROR

docker/default.config.yml

@@ -12,6 +12,9 @@ server:
     pretty_print: true
     limit: 10
     # templates: /path/to/templates
+    map:
+        url: https://maps.wikimedia.org/osm-intl/{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>'
 
 logging:
     level: ERROR

docker/examples/elastic/pygeoapi/docker.config.yml

@@ -10,6 +10,9 @@ server:
     pretty_print: true
     limit: 10
     # templates: /path/to/templates
+    map:
+        url: https://maps.wikimedia.org/osm-intl/{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>'
 
 logging:
     level: ERROR

docker/examples/simple/my.config.yml

@@ -10,6 +10,9 @@ server:
     pretty_print: true
     limit: 10
     # templates: /path/to/templates
+    map:
+        url: https://maps.wikimedia.org/osm-intl/{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>'
 
 logging:
     level: ERROR

pygeoapi-config.yml

@@ -10,6 +10,9 @@ server:
     pretty_print: true
     limit: 10
     # templates: /path/to/templates
+    map:
+        url: https://maps.wikimedia.org/osm-intl/{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>'
 
 logging:
     level: ERROR

pygeoapi/templates/item.html

@@ -79,7 +79,7 @@
     <script>
     var map = L.map('items-map').setView([{{ 45 }}, {{ -75 }}], 10);
     map.addLayer(new L.TileLayer(
-        'https://tile.osm.org/{z}/{x}/{y}.png', {
+        '{{ config['server']['map']['url'] }}', {
             maxZoom: 18,
             subdomains: '1234'
         }

pygeoapi/templates/items.html

@@ -74,9 +74,10 @@
     <script>
     var map = L.map('items-map').setView([{{ 45 }}, {{ -75 }}], 5);
     map.addLayer(new L.TileLayer(
-        'https://tile.osm.org/{z}/{x}/{y}.png', {
+        '{{ config['server']['map']['url'] }}', {
             maxZoom: 18,
-            subdomains: '1234'
+            subdomains: '1234',
+            attribution: '{{ config['server']['map']['attribution'] }}'
         }
     ));
     var geojson_data = {{ data['features'] |to_json }};

tests/pygeoapi-test-config.yml

@@ -10,6 +10,9 @@ server:
     pretty_print: true
     limit: 10
     # templates: /path/to/templates
+    map:
+        url: https://maps.wikimedia.org/osm-intl/{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>'
 
 logging:
     level: ERROR

tests/pygeoapi-test-ogr-config.yml

@@ -10,6 +10,9 @@ server:
     pretty_print: true
     limit: 10
     # templates: /path/to/templates
+    map:
+        url: https://maps.wikimedia.org/osm-intl/{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>'
 
 logging:
     level: ERROR