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

Replace mapquest tiles in examples

examples/dynamicData/main.js

@@ -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/geoJSON/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/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/legend/main.js

@@ -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/osm/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/reprojection/index.jade

@@ -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

examples/reprojection/main.js

@@ -140,7 +140,7 @@ $(function () {
  if (query.url) {
  layerParams.url = query.url;
  } else {
- layerParams.baseUrl = 'http://otile1.mqcdn.com/tiles/1.0.0/map/';
+ layerParams.url = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
  }
  // Create a map object
  var map = geo.map(mapParams);

examples/tiles/index.jade

@@ -56,12 +56,10 @@ block append mainContent
 
  .form-group(title="The url used to fetch tiles. Use {x}, {y}, {z}, and {s} for templating.")
  label(for="layer-url") Tile URL
- input#layer-url.layerparam(param-name="url", list="url-list", placeholder="http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png")
+ input#layer-url.layerparam(param-name="url", list="url-list", placeholder="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png")
  datalist#url-list
- 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
  option(value="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", credit="© OpenStreetMap contributors") OSM
  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="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

examples/tiles/main.js

@@ -36,9 +36,9 @@
  * is used by itself (e.g., 'abc' is the same as 'a,b,c').
  * unitsPerPixel: set the units per pixel at zoom level 0.
  * url: url to use for the map files. Placeholders are allowed. Default is
- * http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png . Other useful
+ * http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png . Other useful
  * urls are are: /data/tilefancy.png
- * http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
+ * http://tile.stamen.com/toner-lite/{z}/{x}/{y}.png
  * w: width of a tiled image (at max zoom). If w and h are specified, a
  * variety of other changes are made to make this served in image
  * coordinates.
@@ -123,7 +123,7 @@ $(function () {
  if (query.url) {
  layerParams.url = query.url;
  } else {
- layerParams.baseUrl = 'http://otile1.mqcdn.com/tiles/1.0.0/map/';
+ layerParams.url = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
  }
  if (query.subdomains) {
  if (query.subdomains.indexOf(',') >= 0) {
@@ -357,9 +357,6 @@ $(function () {
  break;
  case 'url':
  var url = processedValue;
- if (layerParams.baseUrl) {
- delete layerParams.baseUrl;
- }
  layerParams[param] = processedValue;
  osmLayer.url(url);
  osmLayer.attribution($('#url-list [value="' + value + '"]').attr(
@@ -377,9 +374,6 @@ $(function () {
  default:
  if (ctl.is('.layerparam')) {
  layerParams[param] = processedValue;
- if (param === 'url' && layerParams.baseUrl) {
- delete layerParams.baseUrl;
- }
  if (osmLayer[param]) {
  osmLayer[param](processedValue);
  }

examples/transitions/main.js

@@ -19,7 +19,6 @@ $(function () {
 
  // Add an OSM layer
  map.createLayer('osm', {
- baseUrl: 'http://otile1.mqcdn.com/tiles/1.0.0/map',
  renderer: query.renderer ? (query.renderer === 'html' ? null : query.renderer) : undefined
  });
 

examples/widgets/main.js

@@ -39,13 +39,8 @@ $(function () {
  zoom: 4
  });
 
- // 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');
 
  // Plot points for the 3 cities
  var layer = map.createLayer('feature', {'renderer' : 'd3'});

examples/wms/main.js

@@ -9,11 +9,6 @@ $(function () {
  center: {x: -98.0, y: 39.5}
  });
 
- // Add an OSM layer
- map.createLayer('osm', {
- baseUrl: 'http://otile1.mqcdn.com/tiles/1.0.0/sat'
- });
-
  // Add an OSM layer with a WMS server as the source of its titles
  var wms = map.createLayer('osm', {keepLower: false, attribution: null});