From 145bf632a2fa0f187384798f75a9b69fad5f6d6e Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Fri, 24 May 2019 12:33:42 -0400
Subject: [PATCH 1/2] make map URL configurable (thanks @alexandreleroux)

---
 aws-lambda/pygeoapi-serverless-config.yml          | 3 +++
 docker/default.config.yml                          | 3 +++
 docker/examples/elastic/pygeoapi/docker.config.yml | 3 +++
 docker/examples/simple/my.config.yml               | 3 +++
 pygeoapi-config.yml                                | 3 +++
 pygeoapi/templates/item.html                       | 2 +-
 pygeoapi/templates/items.html                      | 5 +++--
 tests/pygeoapi-test-config.yml                     | 3 +++
 tests/pygeoapi-test-ogr-config.yml                 | 3 +++
 9 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/aws-lambda/pygeoapi-serverless-config.yml b/aws-lambda/pygeoapi-serverless-config.yml
index 86fe27a..3fff06c 100644
--- a/aws-lambda/pygeoapi-serverless-config.yml
+++ b/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: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
 
 logging:
     level: ERROR
diff --git a/docker/default.config.yml b/docker/default.config.yml
index 6cfd21a..901003e 100644
--- a/docker/default.config.yml
+++ b/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: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
 
 logging:
     level: ERROR
diff --git a/docker/examples/elastic/pygeoapi/docker.config.yml b/docker/examples/elastic/pygeoapi/docker.config.yml
index dd5deb1..e2b1557 100644
--- a/docker/examples/elastic/pygeoapi/docker.config.yml
+++ b/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: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
 
 logging:
     level: ERROR
diff --git a/docker/examples/simple/my.config.yml b/docker/examples/simple/my.config.yml
index 23811fb..79a0134 100644
--- a/docker/examples/simple/my.config.yml
+++ b/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: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
 
 logging:
     level: ERROR
diff --git a/pygeoapi-config.yml b/pygeoapi-config.yml
index 3cf6770..c1f9e22 100644
--- a/pygeoapi-config.yml
+++ b/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: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
 
 logging:
     level: ERROR
diff --git a/pygeoapi/templates/item.html b/pygeoapi/templates/item.html
index ebeae9d..5e9fd5c 100644
--- a/pygeoapi/templates/item.html
+++ b/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'
         }
diff --git a/pygeoapi/templates/items.html b/pygeoapi/templates/items.html
index 4cd9c1a..92fef94 100644
--- a/pygeoapi/templates/items.html
+++ b/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 }};
diff --git a/tests/pygeoapi-test-config.yml b/tests/pygeoapi-test-config.yml
index f4c167a..a60d104 100644
--- a/tests/pygeoapi-test-config.yml
+++ b/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: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
 
 logging:
     level: ERROR
diff --git a/tests/pygeoapi-test-ogr-config.yml b/tests/pygeoapi-test-ogr-config.yml
index 868334d..cdc100a 100644
--- a/tests/pygeoapi-test-ogr-config.yml
+++ b/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: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
 
 logging:
     level: ERROR

From 2c47ee11613e7cf4dd5a2b06bbf55055e7eeb5ba Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Mon, 27 May 2019 07:00:45 -0400
Subject: [PATCH 2/2] update attribution

---
 aws-lambda/pygeoapi-serverless-config.yml          | 2 +-
 docker/default.config.yml                          | 2 +-
 docker/examples/elastic/pygeoapi/docker.config.yml | 2 +-
 docker/examples/simple/my.config.yml               | 2 +-
 pygeoapi-config.yml                                | 2 +-
 tests/pygeoapi-test-config.yml                     | 2 +-
 tests/pygeoapi-test-ogr-config.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aws-lambda/pygeoapi-serverless-config.yml b/aws-lambda/pygeoapi-serverless-config.yml
index 3fff06c..38a3f4f 100644
--- a/aws-lambda/pygeoapi-serverless-config.yml
+++ b/aws-lambda/pygeoapi-serverless-config.yml
@@ -12,7 +12,7 @@ server:
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
-        attribution: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        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
diff --git a/docker/default.config.yml b/docker/default.config.yml
index 901003e..5842150 100644
--- a/docker/default.config.yml
+++ b/docker/default.config.yml
@@ -14,7 +14,7 @@ server:
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
-        attribution: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        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
diff --git a/docker/examples/elastic/pygeoapi/docker.config.yml b/docker/examples/elastic/pygeoapi/docker.config.yml
index e2b1557..6398cf7 100644
--- a/docker/examples/elastic/pygeoapi/docker.config.yml
+++ b/docker/examples/elastic/pygeoapi/docker.config.yml
@@ -12,7 +12,7 @@ server:
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
-        attribution: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        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
diff --git a/docker/examples/simple/my.config.yml b/docker/examples/simple/my.config.yml
index 79a0134..8ec75a9 100644
--- a/docker/examples/simple/my.config.yml
+++ b/docker/examples/simple/my.config.yml
@@ -12,7 +12,7 @@ server:
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
-        attribution: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        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
diff --git a/pygeoapi-config.yml b/pygeoapi-config.yml
index c1f9e22..c8bbd0f 100644
--- a/pygeoapi-config.yml
+++ b/pygeoapi-config.yml
@@ -12,7 +12,7 @@ server:
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
-        attribution: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        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
diff --git a/tests/pygeoapi-test-config.yml b/tests/pygeoapi-test-config.yml
index a60d104..e1f7235 100644
--- a/tests/pygeoapi-test-config.yml
+++ b/tests/pygeoapi-test-config.yml
@@ -12,7 +12,7 @@ server:
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
-        attribution: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        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
diff --git a/tests/pygeoapi-test-ogr-config.yml b/tests/pygeoapi-test-ogr-config.yml
index cdc100a..1a598d2 100644
--- a/tests/pygeoapi-test-ogr-config.yml
+++ b/tests/pygeoapi-test-ogr-config.yml
@@ -12,7 +12,7 @@ server:
     # templates: /path/to/templates
     map:
         url: https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png
-        attribution: 'Wikimedia maps | Map data &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap contributors</a>'
+        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