Merge pull request #598 from OpenGeoscience/replace-mapquest-tiles

Replace mapquest tiles in examples

Author: jbeezley

examples/choropleth/thumb.jpg

@@ -14,10 +14,8 @@ $(function () {
     .end(omega)
     .state('play');
 
-  // Add an OSM layer with MapQuest satellite image tiles
-  map.createLayer('osm', {
-    baseUrl: 'http://otile1.mqcdn.com/tiles/1.0.0/sat'
-  });
+  // Add an OSM layer
+  map.createLayer('osm');
 
   // Add a feature layer with a D3 renderer.  We could, instead, ask for any
   // renderer that supports point features, like so:

examples/dynamicData/main.js

@@ -16,7 +16,12 @@ $(function () {
   map.createLayer(
     'osm',
     {
-      baseUrl: 'http://otile1.mqcdn.com/tiles/1.0.0/map/'
+      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="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>.'
+      ].join(' ')
     }
   );
 

examples/geoJSON/main.js

@@ -361,13 +361,8 @@ $(function () {
     zoom: 3
   });
 
-  // Add the osm layer with a custom tile url
-  map.createLayer(
-    'osm',
-    {
-      baseUrl: 'http://otile1.mqcdn.com/tiles/1.0.0/map/'
-    }
-  );
+  // Add the default osm layer
+  map.createLayer('osm');
 
   // Create a feature layer to draw on.
   layer = map.createLayer('feature', {features: [geo.lineFeature.capabilities.multicolor]});

examples/geoJSON/thumb.jpg

@@ -8,13 +8,8 @@ $(function () {
     zoom: 3
   });
 
-  // Add the osm layer with a custom tile url
-  map.createLayer(
-    'osm',
-    {
-      baseUrl: 'http://otile1.mqcdn.com/tiles/1.0.0/map/'
-    }
-  );
+  // Add the default osm layer
+  map.createLayer('osm');
 
   // Create a ui layer
   var ui = map.createLayer('ui');

examples/hurricanes/main.js

@@ -16,7 +16,12 @@ $(function () {
   map.createLayer(
     'osm',
     {
-      baseUrl: 'http://otile1.mqcdn.com/tiles/1.0.0/map/'
+      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="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>.'
+      ].join(' ')
     }
   );
 });

examples/hurricanes/thumb.jpg

@@ -4,11 +4,9 @@ block append mainContent
   div#controls
     .form-group(title="The url used to fetch tiles.  Use {x}, {y}, {z}, and {s} for templating.")
       label(for="layer-url") Tile URL
-      select#layer-url.layerparam(param-name="url", list="url-list", placeholder="http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png")
-        option(value="http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png", credit='Tiles Courtesy of <a href="http://www.mapquest.com/">MapQuest</a>') MapQuest
+      select#layer-url.layerparam(param-name="url", list="url-list", placeholder="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png")
         option(value="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", credit="© OpenStreetMap contributors") OpenStreetMap
         option(value="../../data/tilefancy.png", credit="") Fancy Test Tile
-        option(value="http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png", credit='Tiles Courtesy of <a href="http://www.mapquest.com/">MapQuest</a>') MapQuest Satellite
         option(value="http://tile.stamen.com/toner-lite/{z}/{x}/{y}.png", credit='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>.') Toner Lite
     .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