Merge pull request #1292 from OpenGeoscience/remove-stamen

fix: Change default back to OSM
OpenGeoscience · Oct 9, 2023 · 0539ead · 0539ead
2 parents a5e6f9a + 530cc03
commit 0539ead
Show file tree

Hide file tree

Showing 13 changed files with 2,592 additions and 2,053 deletions.
diff --git a/examples/flights/main.js b/examples/flights/main.js
@@ -88,8 +88,8 @@ map = geo.map({
 
 // Add the default osm layer
 map.createLayer('osm', {
-  source: query.map !== 'light' ? 'stamen-toner-lite' : 'osm',
-  opacity: query.map !== 'light' ? 0.25 : 1
+  source: query.map === 'dark' ? 'stamen-toner-lite' : 'osm',
+  opacity: query.map === 'dark' ? 0.25 : 1
 });
 
 if (query.map !== 'light') {

diff --git a/examples/geoJSON/main.js b/examples/geoJSON/main.js
@@ -17,7 +17,7 @@ $(function () {
   });
 
   // Add the osm layer with a custom tile url
-  map.createLayer('osm', {source: 'stamen-toner-lite'});
+  map.createLayer('osm', {source: 'osm'});
 
   // Create a layer to put the features in.  We could need point, line, and
   // polygon features, so ask for a layer that supports all of them.

diff --git a/examples/measure/index.pug b/examples/measure/index.pug
@@ -5,7 +5,7 @@ block append mainContent
     button#show(title='Show the control panel') Show
     .form-group
       label(for='basemap') Base map
-      select#basemap(param-name='basemap', placeholder='stamen-toner-lite')
+      select#basemap(param-name='basemap', placeholder='osm')
         option(value='custom') Custom
       button#hide(title='Hide the control panel') Hide
       input#mapurl.hidden(param-name='mapurl')

diff --git a/examples/measure/main.js b/examples/measure/main.js
@@ -63,7 +63,7 @@ for (const option in options) {
 var map, mapLayer, layer, fromButtonSelect, fromGeojsonUpdate;
 
 // Set controls based on query parameters
-$('#basemap').val(query.basemap || 'stamen-toner-lite');
+$('#basemap').val(query.basemap || 'osm');
 $('#mapurl').val(query.mapurl || '');
 $('#mapurl').toggleClass('hidden', $('#basemap').val() !== 'custom');
 $('#distunit').val(query.distunit || 'decmiles');

diff --git a/examples/osm/main.js b/examples/osm/main.js
@@ -16,12 +16,8 @@ $(function () {
   map.createLayer(
     'osm',
     {
-      url: 'http://tile.stamen.com/toner-lite/{z}/{x}/{y}.png',
-      attribution: ['Map tiles by <a href="http://stamen.com">Stamen Design</a>,',
-        'under <a href="https://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>.',
-        'Data by <a href="https://openstreetmap.org">OpenStreetMap</a>, under',
-        '<a href="https://openstreetmap.org/copyright">ODbL</a>.'
-      ].join(' ')
+      url: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSImageryOnly/MapServer/tile/{z}/{y}/{x}',
+      attribution: 'Tile data from <a href="https://basemap.nationalmap.gov/">USGS</a>'
     }
   );
 });
diff --git a/examples/reprojection/index.pug b/examples/reprojection/index.pug
@@ -5,8 +5,8 @@ block append mainContent
     .form-group(title="The url used to fetch tiles.  Use {x}, {y}, {z}, and {s} for templating.  Example: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png")
       label(for="layer-url") Tile URL
       select#layer-url.layerparam(param-name="url", list="url-list")
-        option(value="stamen-toner-lite") Stamen Toner Lite
         option(value="osm") OSM
+        option(value="stamen-toner-lite") Stamen Toner Lite
         option(value="../../data/tilefancy.png") Fancy Test Tile
     .form-group(title="Web maps are most often rendered using a Mercator geographic coordinate system, but other projections can be used.  See spatialreference.org for more information on projections.")
       label(for="map-gcs") Map GCS

diff --git a/examples/tiles/index.pug b/examples/tiles/index.pug
@@ -58,8 +58,8 @@ block append mainContent
       label(for="layer-url") Tile URL
       input#layer-url.layerparam(param-name="url", list="url-list")
       datalist#url-list
-        option(value="stamen-toner-lite") Stamen Toner Lite
         option(value="osm") OSM
+        option(value="stamen-toner-lite") Stamen Toner Lite
         option(value="../../data/tilefancy.png") Fancy Test Tile
     .form-group(title="The subdomains used to fetch tiles.  This can be a comma-separated list or a string of single-letter subdomains.")
       label(for="layer-subdomains") URL Subdomains