diff --git a/examples/choropleth/thumb.jpg b/examples/choropleth/thumb.jpg
index 442329028d..1dfb3282c5 100644
Binary files a/examples/choropleth/thumb.jpg and b/examples/choropleth/thumb.jpg differ
diff --git a/examples/dynamicData/main.js b/examples/dynamicData/main.js
index 56943cd096..4954a4f85b 100644
--- a/examples/dynamicData/main.js
+++ b/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:
diff --git a/examples/geoJSON/main.js b/examples/geoJSON/main.js
index 489199aa4b..e624d8765d 100644
--- a/examples/geoJSON/main.js
+++ b/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 Stamen Design,',
+ 'under CC BY 3.0.',
+ 'Data by OpenStreetMap, under',
+ 'ODbL.'
+ ].join(' ')
}
);
diff --git a/examples/geoJSON/thumb.jpg b/examples/geoJSON/thumb.jpg
index 13e659a6b2..9a23d281bd 100644
Binary files a/examples/geoJSON/thumb.jpg and b/examples/geoJSON/thumb.jpg differ
diff --git a/examples/hurricanes/main.js b/examples/hurricanes/main.js
index 1cbb7acf09..4b76dafb70 100644
--- a/examples/hurricanes/main.js
+++ b/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]});
diff --git a/examples/hurricanes/thumb.jpg b/examples/hurricanes/thumb.jpg
index 765b108f54..3196a7222c 100644
Binary files a/examples/hurricanes/thumb.jpg and b/examples/hurricanes/thumb.jpg differ
diff --git a/examples/legend/main.js b/examples/legend/main.js
index ff2c38f18f..3c9896c88e 100644
--- a/examples/legend/main.js
+++ b/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');
diff --git a/examples/legend/thumb.jpg b/examples/legend/thumb.jpg
index 0f40c2f64f..49204293a3 100644
Binary files a/examples/legend/thumb.jpg and b/examples/legend/thumb.jpg differ
diff --git a/examples/osm/main.js b/examples/osm/main.js
index a6afb68e04..a6a2960897 100644
--- a/examples/osm/main.js
+++ b/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 Stamen Design,',
+ 'under CC BY 3.0.',
+ 'Data by OpenStreetMap, under',
+ 'ODbL.'
+ ].join(' ')
}
);
});
diff --git a/examples/reprojection/index.jade b/examples/reprojection/index.jade
index c361320818..c3c3242a53 100644
--- a/examples/reprojection/index.jade
+++ b/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 MapQuest') 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 MapQuest') MapQuest Satellite
option(value="http://tile.stamen.com/toner-lite/{z}/{x}/{y}.png", credit='Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.') 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
diff --git a/examples/reprojection/main.js b/examples/reprojection/main.js
index da5c18ec91..9ecb68d729 100644
--- a/examples/reprojection/main.js
+++ b/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);
diff --git a/examples/tiles/index.jade b/examples/tiles/index.jade
index c67e57e5bd..4c76f12728 100644
--- a/examples/tiles/index.jade
+++ b/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 MapQuest') 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 MapQuest') MapQuest Satellite
option(value="http://tile.stamen.com/toner-lite/{z}/{x}/{y}.png", credit='Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.') 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
diff --git a/examples/tiles/main.js b/examples/tiles/main.js
index ac7449839e..83c4922da3 100644
--- a/examples/tiles/main.js
+++ b/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);
}
diff --git a/examples/tiles/thumb.jpg b/examples/tiles/thumb.jpg
index 1e6b6abb53..a79b5d4005 100644
Binary files a/examples/tiles/thumb.jpg and b/examples/tiles/thumb.jpg differ
diff --git a/examples/transitions/main.js b/examples/transitions/main.js
index 39e3c0be1d..b92ead2ddd 100644
--- a/examples/transitions/main.js
+++ b/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
});
diff --git a/examples/transitions/thumb.jpg b/examples/transitions/thumb.jpg
index ac151b47ff..09f5a330da 100644
Binary files a/examples/transitions/thumb.jpg and b/examples/transitions/thumb.jpg differ
diff --git a/examples/widgets/main.js b/examples/widgets/main.js
index 5c2639f632..a14ae7ec0b 100644
--- a/examples/widgets/main.js
+++ b/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'});
diff --git a/examples/widgets/thumb.jpg b/examples/widgets/thumb.jpg
index 799d5f73c5..b8eeb54013 100644
Binary files a/examples/widgets/thumb.jpg and b/examples/widgets/thumb.jpg differ
diff --git a/examples/wms/main.js b/examples/wms/main.js
index 22b55d230c..4119d48eee 100644
--- a/examples/wms/main.js
+++ b/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});
diff --git a/examples/wms/thumb.jpg b/examples/wms/thumb.jpg
index 02a9f9c38d..8509862c2e 100644
Binary files a/examples/wms/thumb.jpg and b/examples/wms/thumb.jpg differ