Remove MapQuest source

2016-07-01 11:34:37 +02:00
parent c56432cf2e
commit ed80d243fb
45 changed files with 88 additions and 262 deletions
--- a/changelog/upgrade-notes.md
+++ b/changelog/upgrade-notes.md
@@ -1,5 +1,9 @@
 ## Upgrade notes

+#### `ol.source.MapQuest` removal
+
+Because of changes at MapQuest (see: https://lists.openstreetmap.org/pipermail/talk/2016-June/076106.html) we had to remove the MapQuest source for now (see https://github.com/openlayers/ol3/issues/5484 for details).
+
 #### `ol.interaction.ModifyEvent` changes

 The event object previously had a `mapBrowserPointerEvent` property, which has been renamed to `mapBrowserEvent`.
--- a/doc/quickstart.hbs
+++ b/doc/quickstart.hbs
@@ -31,7 +31,7 @@ Below you'll find a complete working example.  Create a new file, copy in the co
        target: 'map',
        layers: [
          new ol.layer.Tile({
-            source: new ol.source.MapQuest({layer: 'sat'})
+            source: new ol.source.OSM()
          })
        ],
        view: new ol.View({
@@ -85,7 +85,7 @@ The map in the application is contained in a [`<div>` HTML element](http://en.wi
    target: 'map',
    layers: [
      new ol.layer.Tile({
-        source: new ol.source.MapQuest({layer: 'sat'})
+        source: new ol.source.OSM()
      })
    ],
    view: new ol.View({
@@ -95,7 +95,7 @@ The map in the application is contained in a [`<div>` HTML element](http://en.wi
  });
 ```

-With this JavaScript code, a map object is created with a MapQuest Open Aerial layer zoomed on the African East coast. Let's break this down:
+With this JavaScript code, a map object is created with an OSM layer zoomed on the African East coast. Let's break this down:

 The following line creates an OpenLayers `Map` object. Just by itself, this does nothing since there's no layers or interaction attached to it.

@@ -114,7 +114,7 @@ The `layers: [ ... ]` array is used to define the list of layers available in th
 ```js
    layers: [
      new ol.layer.Tile({
-        source: new ol.source.MapQuest({layer: 'sat'})
+        source: new ol.source.OSM()
      })
    ]
 ```
--- a/examples/arcgis-image.js
+++ b/examples/arcgis-image.js
@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Image');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.ImageArcGISRest');

 var url = 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +
@@ -10,10 +10,11 @@ var url = 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +

 var layers = [
  new ol.layer.Tile({
-    source: new ol.source.MapQuest({layer: 'sat'})
+    source: new ol.source.OSM()
  }),
  new ol.layer.Image({
    source: new ol.source.ImageArcGISRest({
+      ratio: 1,
      params: {},
      url: url
    })
--- a/examples/arcgis-tiled.js
+++ b/examples/arcgis-tiled.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.TileArcGISRest');

 var url = 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +
@@ -9,7 +9,7 @@ var url = 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +

 var layers = [
  new ol.layer.Tile({
-    source: new ol.source.MapQuest({layer: 'sat'})
+    source: new ol.source.OSM()
  }),
  new ol.layer.Tile({
    extent: [-13884991, 2870341, -7455066, 6338219],
--- a/examples/cluster.js
+++ b/examples/cluster.js
@@ -5,7 +5,7 @@ goog.require('ol.geom.Point');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.Cluster');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
@@ -62,7 +62,7 @@ var clusters = new ol.layer.Vector({
 });

 var raster = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'sat'})
+  source: new ol.source.OSM()
 });

 var map = new ol.Map({
--- a/examples/drag-rotate-and-zoom.js
+++ b/examples/drag-rotate-and-zoom.js
@@ -3,7 +3,7 @@ goog.require('ol.View');
 goog.require('ol.interaction');
 goog.require('ol.interaction.DragRotateAndZoom');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');


 var map = new ol.Map({
@@ -12,7 +12,7 @@ var map = new ol.Map({
  ]),
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'sat'})
+      source: new ol.source.OSM()
    })
  ],
  renderer: common.getRendererFromQueryString(),
--- a/examples/draw-and-modify-features.js
+++ b/examples/draw-and-modify-features.js
@@ -6,7 +6,7 @@ goog.require('ol.interaction.Draw');
 goog.require('ol.interaction.Modify');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
@@ -14,7 +14,7 @@ goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');

 var raster = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'sat'})
+  source: new ol.source.OSM()
 });

 var map = new ol.Map({
--- a/examples/draw-features.js
+++ b/examples/draw-features.js
@@ -4,7 +4,7 @@ goog.require('ol.geom.Polygon');
 goog.require('ol.interaction.Draw');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
@@ -12,7 +12,7 @@ goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');

 var raster = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'sat'})
+  source: new ol.source.OSM()
 });

 var source = new ol.source.Vector({wrapX: false});
--- a/examples/dynamic-data.js
+++ b/examples/dynamic-data.js
@@ -4,7 +4,7 @@ goog.require('ol.View');
 goog.require('ol.geom.MultiPoint');
 goog.require('ol.geom.Point');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
@@ -14,7 +14,7 @@ goog.require('ol.style.Style');
 var map = new ol.Map({
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'sat'})
+      source: new ol.source.OSM()
    })
  ],
  renderer: common.getRendererFromQueryString(),
--- a/examples/image-vector-layer.js
+++ b/examples/image-vector-layer.js
@@ -5,7 +5,7 @@ goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.source.ImageVector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
@@ -15,7 +15,7 @@ goog.require('ol.style.Style');
 var map = new ol.Map({
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'sat'})
+      source: new ol.source.OSM()
    }),
    new ol.layer.Image({
      source: new ol.source.ImageVector({
--- a/examples/jsts.js
+++ b/examples/jsts.js
@@ -7,7 +7,7 @@ goog.require('ol.format.GeoJSON');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');


@@ -39,9 +39,7 @@ var vectorLayer = new ol.layer.Vector({
 });

 var rasterLayer = new ol.layer.Tile({
-  source: new ol.source.MapQuest({
-    layer: 'osm'
-  })
+  source: new ol.source.OSM()
 });

 var map = new ol.Map({
--- a/examples/layer-group.html
+++ b/examples/layer-group.html
@@ -12,7 +12,7 @@ resources:
 <div id="layertree">
  <h5>Click on layer nodes below to change their properties.</h5>
  <ul>
-    <li><span>OpenAerial layer</span>
+    <li><span>OSM layer</span>
      <fieldset id="layer0">
        <label class="checkbox" for="visible0">
          <input id="visible0" class="visible" type="checkbox"/>visibility
--- a/examples/layer-group.js
+++ b/examples/layer-group.js
@@ -3,13 +3,13 @@ goog.require('ol.View');
 goog.require('ol.layer.Group');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.TileJSON');

 var map = new ol.Map({
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'sat'})
+      source: new ol.source.OSM()
    }), new ol.layer.Group({
      layers: [
        new ol.layer.Tile({
--- a/examples/lazy-source.js
+++ b/examples/lazy-source.js
@@ -1,9 +1,9 @@
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');

-var source = new ol.source.MapQuest({layer: 'sat'});
+var source = new ol.source.OSM();

 var layer = new ol.layer.Tile();

--- a/examples/line-arrows.js
+++ b/examples/line-arrows.js
@@ -4,14 +4,14 @@ goog.require('ol.geom.Point');
 goog.require('ol.interaction.Draw');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Icon');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');

 var raster = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'sat'})
+  source: new ol.source.OSM()
 });

 var source = new ol.source.Vector();
--- a/examples/mapquest.html
+++ b/examples/mapquest.html
@@ -1,14 +0,0 @@
---
-layout: example.html
-title: MapQuest
-shortdesc: Example of a MapQuest map.Shows how to create custom controls.
-docs: >
-  Example of a MapQuest map.
-tags: "mapquest"
---
-<div id="map" class="map"></div>
-<select id="layer-select">
-  <option value="Aerial">Aerial</option>
-  <option value="AerialWithLabels">Aerial with labels</option>
-  <option value="Road" selected>Road</option>
-</select>
--- a/examples/mapquest.js
+++ b/examples/mapquest.js
@@ -1,56 +0,0 @@
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.layer.Group');
-goog.require('ol.layer.Tile');
-goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
-
-
-var layers = [
-  new ol.layer.Tile({
-    style: 'Road',
-    source: new ol.source.MapQuest({layer: 'osm'})
-  }),
-  new ol.layer.Tile({
-    style: 'Aerial',
-    visible: false,
-    source: new ol.source.MapQuest({layer: 'sat'})
-  }),
-  new ol.layer.Group({
-    style: 'AerialWithLabels',
-    visible: false,
-    layers: [
-      new ol.layer.Tile({
-        source: new ol.source.MapQuest({layer: 'sat'})
-      }),
-      new ol.layer.Tile({
-        source: new ol.source.MapQuest({layer: 'hyb'})
-      })
-    ]
-  })
-];
-
-var map = new ol.Map({
-  layers: layers,
-  renderer: common.getRendererFromQueryString(),
-  target: 'map',
-  view: new ol.View({
-    center: ol.proj.transform(
-        [-73.979378, 40.702222], 'EPSG:4326', 'EPSG:3857'),
-    zoom: 9
-  })
-});
-
-var select = document.getElementById('layer-select');
-
-function onChange() {
-  var style = select.value;
-  var i, ii;
-  for (i = 0, ii = layers.length; i < ii; ++i) {
-    layers[i].set('visible', (layers[i].get('style') == style));
-  }
-}
-
-select.addEventListener('change', onChange);
-
-onChange();
--- a/examples/measure.js
+++ b/examples/measure.js
@@ -9,7 +9,7 @@ goog.require('ol.interaction.Draw');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
@@ -20,7 +20,7 @@ goog.require('ol.style.Style');
 var wgs84Sphere = new ol.Sphere(6378137);

 var raster = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'sat'})
+  source: new ol.source.OSM()
 });

 var source = new ol.source.Vector();
--- a/examples/modify-features.js
+++ b/examples/modify-features.js
@@ -6,14 +6,12 @@ goog.require('ol.interaction.Modify');
 goog.require('ol.interaction.Select');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');


 var raster = new ol.layer.Tile({
-  source: new ol.source.MapQuest({
-    layer: 'sat'
-  })
+  source: new ol.source.OSM()
 });

 var vector = new ol.layer.Vector({
--- a/examples/overlay.html
+++ b/examples/overlay.html
@@ -4,7 +4,7 @@ title: Overlay
 shortdesc: Demonstrates overlays.
 docs: >
  <p>The popups are created using <a href="http://getbootstrap.com/javascript/#popovers">Popovers</a> from Bootstrap.</p>
-tags: "overlay, popup, bootstrap, popover, mapquest, openaerial"
+tags: "overlay, popup, bootstrap, popover"
 resources:
  - https://code.jquery.com/jquery-2.2.3.min.js
  - https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css
--- a/examples/overlay.js
+++ b/examples/overlay.js
@@ -4,11 +4,11 @@ goog.require('ol.View');
 goog.require('ol.coordinate');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');


 var layer = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'sat'})
+  source: new ol.source.OSM()
 });

 var map = new ol.Map({
--- a/examples/popup.html
+++ b/examples/popup.html
@@ -6,7 +6,7 @@ docs: >
  <p>
    Click on the map to get a popup.  The popup is composed of a few basic elements: a container, a close button, and a place for the content.  To anchor the popup to the map, an <code>ol.Overlay</code> is created with the popup container.  A listener is registered for the map's <code>click</code> event to display the popup, and another listener is set as the <code>click</code> handler for the close button to hide the popup.
  </p>
-tags: "overlay, popup, mapquest, openaerial"
+tags: "overlay, popup"
 ---
 <div id="map" class="map"></div>
 <div id="popup" class="ol-popup">
--- a/examples/reprojection-by-code.html
+++ b/examples/reprojection-by-code.html
@@ -1,12 +1,12 @@
 ---
 layout: example.html
 title: Reprojection with EPSG.io Search
-shortdesc: Demonstrates client-side raster reprojection of MapQuest OSM to arbitrary projection
+shortdesc: Demonstrates client-side raster reprojection of OSM to arbitrary projection
 docs: >
  This example shows client-side raster reprojection capabilities from
-  MapQuest OSM (EPSG:3857) to arbitrary projection by searching
+  OSM (EPSG:3857) to arbitrary projection by searching
  in <a href="http://epsg.io/">EPSG.io</a> database.
-tags: "reprojection, projection, proj4js, mapquest, epsg.io"
+tags: "reprojection, projection, proj4js, epsg.io"
 resources:
  - http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
 ---
--- a/examples/reprojection-by-code.js
+++ b/examples/reprojection-by-code.js
@@ -3,14 +3,14 @@ goog.require('ol.View');
 goog.require('ol.extent');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.TileImage');


 var map = new ol.Map({
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'osm'})
+      source: new ol.source.OSM()
    })
  ],
  renderer: common.getRendererFromQueryString(),
--- a/examples/reprojection-image.html
+++ b/examples/reprojection-image.html
@@ -4,7 +4,7 @@ title: Image Reprojection
 shortdesc: Demonstrates client-side reprojection of single image source.
 docs: >
  This example shows client-side reprojection of single image source.
-tags: "reprojection, projection, proj4js, mapquest, image, imagestatic"
+tags: "reprojection, projection, proj4js, image, imagestatic"
 resources:
  - http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
 ---
--- a/examples/reprojection-image.js
+++ b/examples/reprojection-image.js
@@ -5,7 +5,7 @@ goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.ImageStatic');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');


 proj4.defs('EPSG:27700', '+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 ' +
@@ -17,7 +17,7 @@ var imageExtent = [0, 0, 700000, 1300000];
 var map = new ol.Map({
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'osm'})
+      source: new ol.source.OSM()
    }),
    new ol.layer.Image({
      source: new ol.source.ImageStatic({
--- a/examples/reprojection.html
+++ b/examples/reprojection.html
@@ -4,7 +4,7 @@ title: Raster Reprojection
 shortdesc: Demonstrates client-side raster reprojection between various projections.
 docs: >
  This example shows client-side raster reprojection between various projections.
-tags: "reprojection, projection, proj4js, mapquest, wms, wmts, hidpi"
+tags: "reprojection, projection, proj4js, osm, wms, wmts, hidpi"
 resources:
  - http://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.14/proj4.js
 ---
@@ -13,7 +13,7 @@ resources:
  <div class="col-md-3">
    <label>Base map:</label>
    <select id="base-layer">
-      <option value="mapquest">MapQuest (EPSG:3857)</option>
+      <option value="osm">OSM (EPSG:3857)</option>
      <option value="wms4326">WMS (EPSG:4326)</option>
    </select>
  </div>
--- a/examples/reprojection.js
+++ b/examples/reprojection.js
@@ -5,7 +5,7 @@ goog.require('ol.extent');
 goog.require('ol.format.WMTSCapabilities');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.TileImage');
 goog.require('ol.source.TileWMS');
 goog.require('ol.source.WMTS');
@@ -64,8 +64,8 @@ layers['bng'] = new ol.layer.Tile({
  })
 });

-layers['mapquest'] = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'osm'})
+layers['osm'] = new ol.layer.Tile({
+  source: new ol.source.OSM()
 });

 layers['wms4326'] = new ol.layer.Tile({
@@ -146,7 +146,7 @@ layers['states'] = new ol.layer.Tile({

 var map = new ol.Map({
  layers: [
-    layers['mapquest'],
+    layers['osm'],
    layers['bng']
  ],
  renderer: common.getRendererFromQueryString(),
--- a/examples/select-features.js
+++ b/examples/select-features.js
@@ -5,11 +5,11 @@ goog.require('ol.format.GeoJSON');
 goog.require('ol.interaction.Select');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');

 var raster = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'sat'})
+  source: new ol.source.OSM()
 });

 var vector = new ol.layer.Vector({
--- a/examples/semi-transparent-layer.html
+++ b/examples/semi-transparent-layer.html
@@ -3,7 +3,7 @@ layout: example.html
 title: Semi-Transparent Layer
 shortdesc: Example of a map with a semi-transparent layer.
 docs: >
-  This example will display a tiled MaxBox layer semi-transparently over a MapQuest background.
-tags: "transparent, mapquest, tilejson"
+  This example will display a tiled MaxBox layer semi-transparently over an OSM background.
+tags: "transparent, osm, tilejson"
 ---
 <div id="map" class="map"></div>
--- a/examples/semi-transparent-layer.js
+++ b/examples/semi-transparent-layer.js
@@ -2,14 +2,14 @@ goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.TileJSON');


 var map = new ol.Map({
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'sat'})
+      source: new ol.source.OSM()
    }),
    new ol.layer.Tile({
      source: new ol.source.TileJSON({
--- a/examples/side-by-side.js
+++ b/examples/side-by-side.js
@@ -2,13 +2,13 @@ goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.has');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');


 var map1 = new ol.Map({
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'sat'})
+      source: new ol.source.OSM()
    })
  ],
  renderer: 'dom',
--- a/examples/snap.js
+++ b/examples/snap.js
@@ -7,7 +7,7 @@ goog.require('ol.interaction.Select');
 goog.require('ol.interaction.Snap');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
@@ -15,7 +15,7 @@ goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');

 var raster = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'sat'})
+  source: new ol.source.OSM()
 });

 var vector = new ol.layer.Vector({
--- a/examples/translate-features.js
+++ b/examples/translate-features.js
@@ -7,12 +7,12 @@ goog.require('ol.interaction.Select');
 goog.require('ol.interaction.Translate');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');


 var raster = new ol.layer.Tile({
-  source: new ol.source.MapQuest({layer: 'sat'})
+  source: new ol.source.OSM()
 });

 var vector = new ol.layer.Vector({
--- a/examples/turf.js
+++ b/examples/turf.js
@@ -7,7 +7,7 @@ goog.require('ol.format.GeoJSON');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');


@@ -44,9 +44,7 @@ var vectorLayer = new ol.layer.Vector({
 });

 var rasterLayer = new ol.layer.Tile({
-  source: new ol.source.MapQuest({
-    layer: 'osm'
-  })
+  source: new ol.source.OSM()
 });

 var map = new ol.Map({
--- a/examples/vector-labels.js
+++ b/examples/vector-labels.js
@@ -3,7 +3,7 @@ goog.require('ol.View');
 goog.require('ol.format.GeoJSON');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
@@ -172,7 +172,7 @@ var vectorPoints = new ol.layer.Vector({
 var map = new ol.Map({
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'osm'})
+      source: new ol.source.OSM()
    }),
    vectorPolygons,
    vectorLines,
--- a/examples/vector-layer.js
+++ b/examples/vector-layer.js
@@ -3,7 +3,7 @@ goog.require('ol.View');
 goog.require('ol.format.GeoJSON');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
@@ -45,7 +45,7 @@ var vectorLayer = new ol.layer.Vector({
 var map = new ol.Map({
  layers: [
    new ol.layer.Tile({
-      source: new ol.source.MapQuest({layer: 'sat'})
+      source: new ol.source.OSM()
    }),
    vectorLayer
  ],
--- a/examples/wms-custom-tilegrid-512x256.js
+++ b/examples/wms-custom-tilegrid-512x256.js
@@ -3,7 +3,7 @@ goog.require('ol.View');
 goog.require('ol.extent');
 goog.require('ol.layer.Tile');
 goog.require('ol.proj');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.TileWMS');
 goog.require('ol.tilegrid.TileGrid');

@@ -22,7 +22,7 @@ var tileGrid = new ol.tilegrid.TileGrid({

 var layers = [
  new ol.layer.Tile({
-    source: new ol.source.MapQuest({layer: 'sat'})
+    source: new ol.source.OSM()
  }),
  new ol.layer.Tile({
    source: new ol.source.TileWMS({
--- a/examples/wms-image.js
+++ b/examples/wms-image.js
@@ -3,12 +3,12 @@ goog.require('ol.View');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
 goog.require('ol.source.ImageWMS');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');


 var layers = [
  new ol.layer.Tile({
-    source: new ol.source.MapQuest({layer: 'sat'})
+    source: new ol.source.OSM()
  }),
  new ol.layer.Image({
    extent: [-13884991, 2870341, -7455066, 6338219],
--- a/examples/wms-tiled-wrap-180.js
+++ b/examples/wms-tiled-wrap-180.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.TileWMS');


 var layers = [
  new ol.layer.Tile({
-    source: new ol.source.MapQuest({layer: 'sat'})
+    source: new ol.source.OSM()
  }),
  new ol.layer.Tile({
    source: new ol.source.TileWMS({
--- a/examples/wms-tiled.js
+++ b/examples/wms-tiled.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.TileWMS');


 var layers = [
  new ol.layer.Tile({
-    source: new ol.source.MapQuest({layer: 'sat'})
+    source: new ol.source.OSM()
  }),
  new ol.layer.Tile({
    extent: [-13884991, 2870341, -7455066, 6338219],
--- a/examples/wms-time.js
+++ b/examples/wms-time.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');
 goog.require('ol.source.TileWMS');

 var startDate = new Date(Date.parse('2012-01-01T19:00:00Z'));
@@ -10,7 +10,7 @@ var animationId = null;

 var layers = [
  new ol.layer.Tile({
-    source: new ol.source.MapQuest({layer: 'sat'})
+    source: new ol.source.OSM()
  }),
  new ol.layer.Tile({
    extent: [-13884991, 2870341, -7455066, 6338219],
--- a/examples/zoomslider.js
+++ b/examples/zoomslider.js
@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.control.ZoomSlider');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.MapQuest');
+goog.require('ol.source.OSM');


 /**
@@ -14,7 +14,7 @@ goog.require('ol.source.MapQuest');
 var createMap = function(divId) {
  var source, layer, map, zoomslider;

-  source = new ol.source.MapQuest({layer: 'sat'});
+  source = new ol.source.OSM();
  layer = new ol.layer.Tile({
    source: source
  });
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -115,14 +115,14 @@ ol.MapProperty = {
 *       }),
 *       layers: [
 *         new ol.layer.Tile({
- *           source: new ol.source.MapQuest({layer: 'osm'})
+ *           source: new ol.source.OSM()
 *         })
 *       ],
 *       target: 'map'
 *     });
 *
 * The above snippet creates a map using a {@link ol.layer.Tile} to display
- * {@link ol.source.MapQuest} OSM data and render it to a DOM element with the
+ * {@link ol.source.OSM} OSM data and render it to a DOM element with the
 * id `map`.
 *
 * The constructor places a viewport container (with CSS class name
--- a/src/ol/source/mapquestsource.js
+++ b/src/ol/source/mapquestsource.js
@@ -1,103 +0,0 @@
-goog.provide('ol.source.MapQuest');
-
-goog.require('goog.asserts');
-goog.require('ol.Attribution');
-goog.require('ol.source.OSM');
-goog.require('ol.source.XYZ');
-
-
-/**
- * @classdesc
- * Layer source for the MapQuest tile server.
- *
- * @constructor
- * @extends {ol.source.XYZ}
- * @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
- * @api stable
- */
-ol.source.MapQuest = function(opt_options) {
-
-  var options = opt_options || {};
-  goog.asserts.assert(options.layer in ol.source.MapQuestConfig,
-      'known layer configured');
-
-  var layerConfig = ol.source.MapQuestConfig[options.layer];
-
-  /**
-   * Layer. Possible values are `osm`, `sat`, and `hyb`.
-   * @type {string}
-   * @private
-   */
-  this.layer_ = options.layer;
-
-  var url = options.url !== undefined ? options.url :
-      'https://otile{1-4}-s.mqcdn.com/tiles/1.0.0/' +
-      this.layer_ + '/{z}/{x}/{y}.jpg';
-
-  ol.source.XYZ.call(this, {
-    attributions: layerConfig.attributions,
-    cacheSize: options.cacheSize,
-    crossOrigin: 'anonymous',
-    logo: 'https://developer.mapquest.com/content/osm/mq_logo.png',
-    maxZoom: layerConfig.maxZoom,
-    reprojectionErrorThreshold: options.reprojectionErrorThreshold,
-    opaque: layerConfig.opaque,
-    tileLoadFunction: options.tileLoadFunction,
-    url: url
-  });
-
-};
-ol.inherits(ol.source.MapQuest, ol.source.XYZ);
-
-
-/**
- * @const
- * @type {ol.Attribution}
- */
-ol.source.MapQuest.TILE_ATTRIBUTION = new ol.Attribution({
-  html: 'Tiles Courtesy of <a href="http://www.mapquest.com/">MapQuest</a>'
-});
-
-
-/**
- * @type {Object.<string, {maxZoom: number, opaque: boolean, attributions: (Array.<ol.Attribution>)}>}
- */
-ol.source.MapQuestConfig = {
-  'osm': {
-    maxZoom: 19,
-    opaque: true,
-    attributions: [
-      ol.source.MapQuest.TILE_ATTRIBUTION,
-      ol.source.OSM.ATTRIBUTION
-    ]
-  },
-  'sat': {
-    maxZoom: 18,
-    opaque: true,
-    attributions: [
-      ol.source.MapQuest.TILE_ATTRIBUTION,
-      new ol.Attribution({
-        html: 'Portions Courtesy NASA/JPL-Caltech and ' +
-            'U.S. Depart. of Agriculture, Farm Service Agency'
-      })
-    ]
-  },
-  'hyb': {
-    maxZoom: 18,
-    opaque: false,
-    attributions: [
-      ol.source.MapQuest.TILE_ATTRIBUTION,
-      ol.source.OSM.ATTRIBUTION
-    ]
-  }
-};
-
-
-/**
- * Get the layer of the source, either `osm`, `sat`, or `hyb`.
- * @return {string} Layer.
- * @api
- */
-ol.source.MapQuest.prototype.getLayer = function() {
-  return this.layer_;
-};