From efb81f361140b0bb860d99fbf9ce7a045b7efa49 Mon Sep 17 00:00:00 2001
From: "Brendan C. Ward" <bcward@astutespruce.com>
Date: Tue, 7 Jun 2022 13:38:35 -0700
Subject: [PATCH 1/2] Switch to stamen basemaps

---
 CHANGELOG.md                   |  1 +
 handlers/templates/map.html    | 30 ++++++++++--------------------
 handlers/templates/map_gl.html |  4 ++--
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3622f1..22413b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 -   added support for specifying host IP address to listen on using the `--host`
     option (#138).
+-   switched basemaps to Stamen Toner Lite
 
 ## 0.8.2
 
diff --git a/handlers/templates/map.html b/handlers/templates/map.html
index ed1c945..ebad7bf 100644
--- a/handlers/templates/map.html
+++ b/handlers/templates/map.html
@@ -54,42 +54,32 @@
 
             var basemaps = [
                 L.tileLayer(
-                    "//{s}.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}",
+                    "https://stamen-tiles.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}.png",
                     {
                         attribution:
-                            "Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ, TomTom, Intermap, iPC, USGS, FAO, NPS, NRCAN, GeoBase, Kadaster NL, Ordnance Survey, Esri Japan, METI, Esri China (Hong Kong), and the GIS User Community",
+                            'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.',
                         subdomains: ["server", "services"],
-                        label: "ESRI Topo"
+                        label: "Stamen Toner Lite"
                     }
                 ),
                 L.tileLayer(
-                    "//server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
+                    "https://stamen-tiles.a.ssl.fastly.net/toner/{z}/{x}/{y}.png",
                     {
                         attribution:
-                            "Tiles &copy; Esri &mdash; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community",
-                        label: "ESRI Imagery"
-                    }
-                ),
-                L.tileLayer(
-                    "//{s}.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}",
-                    {
-                        attribution:
-                            "Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ",
-                        maxZoom: 16,
+                            'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.',
                         subdomains: ["server", "services"],
-                        label: "ESRI Gray"
+                        label: "Stamen Toner Lite"
                     }
                 ),
                 L.tileLayer(
-                    "//{s}.arcgisonline.com/arcgis/rest/services/Elevation/World_Hillshade/MapServer/tile/{z}/{y}/{x}",
+                    "https://stamen-tiles.a.ssl.fastly.net/terrain/{z}/{x}/{y}.png",
                     {
                         attribution:
-                            "Esri, USGS, NGA, NASA, CGIAR, N Robinson, NCEAS, NLS, OS, NMA, Geodatastyrelsen, Rijkswaterstaat, GSA, Geoland, FEMA, Intermap and the GIS user community",
-                        maxZoom: 23,
+                            'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.',
                         subdomains: ["server", "services"],
-                        label: "ESRI Elevation"
+                        label: "Stamen Toner Lite"
                     }
-                )
+                ),
             ];
 
             var map = L.map("Map", {});
diff --git a/handlers/templates/map_gl.html b/handlers/templates/map_gl.html
index 99e0313..e634513 100644
--- a/handlers/templates/map_gl.html
+++ b/handlers/templates/map_gl.html
@@ -31,11 +31,11 @@
             var basemapSource = {
                 type: "raster",
                 tiles: [
-                    "//server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}"
+                    "https://stamen-tiles.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}.png"
                 ],
                 tileSize: 256,
                 attribution:
-                    "Tiles &copy; Esri &mdash; Source: USGS, Esri, TANA, DeLorme, and NPS"
+                'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.',
             };
             var basemapStyle = {
                 id: "basemap",

From e66651b7761a1f4946027be842bb550c1258e960 Mon Sep 17 00:00:00 2001
From: "Brendan C. Ward" <bcward@astutespruce.com>
Date: Tue, 7 Jun 2022 13:42:12 -0700
Subject: [PATCH 2/2] Add PR to changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22413b5..783b167 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 -   added support for specifying host IP address to listen on using the `--host`
     option (#138).
--   switched basemaps to Stamen Toner Lite
+-   switched basemaps to [Stamen map tiles](http://maps.stamen.com/) (#148)
 
 ## 0.8.2