Merge pull request #998 from twpayne/consistent-names

Consistent names

examples/animation.js

@@ -3,7 +3,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.animation');
 goog.require('ol.easing');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 
@@ -23,7 +23,7 @@ var view = new ol.View2D({
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       preload: 4,
       source: new ol.source.OSM()
     })

examples/bind-input.js

@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 goog.require('ol.webgl.SUPPORTED');
 
@@ -19,7 +19,7 @@ if (!ol.webgl.SUPPORTED) {
   info.style.display = '';
 }
 
-var layer = new ol.layer.TileLayer({
+var layer = new ol.layer.Tile({
   source: new ol.source.OSM()
 });
 var map = new ol.Map({

examples/bing-maps.js

@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.BingMaps');
 
@@ -9,7 +9,7 @@ goog.require('ol.source.BingMaps');
 var styles = ['Road', 'Aerial', 'AerialWithLabels'];
 var layers = [];
 for (var i = 0; i < styles.length; ++i) {
-  layers.push(new ol.layer.TileLayer({
+  layers.push(new ol.layer.Tile({
     visible: false,
     preload: Infinity,
     source: new ol.source.BingMaps({

examples/brightness-contrast.js

@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.webgl.SUPPORTED');
 
@@ -22,7 +22,7 @@ if (!ol.webgl.SUPPORTED) {
    */
   info.style.display = '';
 } else {
-  var layer = new ol.layer.TileLayer({
+  var layer = new ol.layer.Tile({
     source: new ol.source.MapQuestOpenAerial()
   });
 

examples/canvas-tiles.js

@@ -1,20 +1,20 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
-goog.require('ol.source.DebugTileSource');
 goog.require('ol.source.OSM');
+goog.require('ol.source.TileDebug');
 goog.require('ol.tilegrid.XYZ');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     }),
-    new ol.layer.TileLayer({
-      source: new ol.source.DebugTileSource({
+    new ol.layer.Tile({
+      source: new ol.source.TileDebug({
         projection: 'EPSG:3857',
         tileGrid: new ol.tilegrid.XYZ({
           maxZoom: 22

examples/custom-controls.js

@@ -4,7 +4,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.Control');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
@@ -67,7 +67,7 @@ var map = new ol.Map({
     new app.RotateNorthControl()
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/device-orientation.js

@@ -3,12 +3,12 @@ goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/drag-rotate-and-zoom.js

@@ -3,7 +3,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.interaction');
 goog.require('ol.interaction.DragRotateAndZoom');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 
 
@@ -12,7 +12,7 @@ var map = new ol.Map({
     new ol.interaction.DragRotateAndZoom()
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOpenAerial()
     })
   ],

examples/epsg-4326.js

@@ -4,13 +4,13 @@ goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
 goog.require('ol.control.ScaleLineUnits');
-goog.require('ol.layer.TileLayer');
-goog.require('ol.source.TiledWMS');
+goog.require('ol.layer.Tile');
+goog.require('ol.source.TileWMS');
 
 
 var layers = [
-  new ol.layer.TileLayer({
-    source: new ol.source.TiledWMS({
+  new ol.layer.Tile({
+    source: new ol.source.TileWMS({
       url: 'http://vmap0.tiles.osgeo.org/wms/vmap0',
       params: {
         'VERSION': '1.1.1',

examples/export-map.js

@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/full-screen-drag-rotate-and-zoom.js

@@ -5,7 +5,7 @@ goog.require('ol.control');
 goog.require('ol.control.FullScreen');
 goog.require('ol.interaction');
 goog.require('ol.interaction.DragRotateAndZoom');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
@@ -17,7 +17,7 @@ var map = new ol.Map({
     new ol.interaction.DragRotateAndZoom()
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
         style: 'Aerial'

examples/full-screen.js

@@ -3,7 +3,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.FullScreen');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
@@ -17,7 +17,7 @@ var map = new ol.Map({
     new ol.control.FullScreen()
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
         style: 'Aerial'

examples/geolocation.js

@@ -4,13 +4,13 @@ goog.require('ol.Overlay');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/getfeatureinfo.js

@@ -1,17 +1,17 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GeoJSON');
-goog.require('ol.source.TiledWMS');
+goog.require('ol.source.TileWMS');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 
 
-var wms = new ol.layer.TileLayer({
-  source: new ol.source.TiledWMS({
+var wms = new ol.layer.Tile({
+  source: new ol.source.TileWMS({
     url: 'http://demo.opengeo.org/geoserver/wms',
     params: {'LAYERS': 'ne:ne'}
   })

examples/gml.js

@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.ogc.GML_v3');
 goog.require('ol.source.MapQuestOpenAerial');
@@ -10,7 +10,7 @@ goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.MapQuestOpenAerial()
 });
 

examples/gpx.js

@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GPX');
 goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.OSM()
 });
 

examples/hue-saturation.js

@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.BingMaps');
 goog.require('ol.webgl.SUPPORTED');
@@ -23,7 +23,7 @@ if (!ol.webgl.SUPPORTED) {
    */
   info.style.display = '';
 } else {
-  var layer = new ol.layer.TileLayer({
+  var layer = new ol.layer.Tile({
     source: new ol.source.BingMaps({
       key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
       style: 'Aerial'

examples/icon.js

@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.Overlay');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GeoJSON');
 goog.require('ol.source.TileJSON');
@@ -11,7 +11,7 @@ goog.require('ol.style.Icon');
 goog.require('ol.style.Style');
 
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.TileJSON({
     url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.jsonp'
   })

examples/kml-earthquakes.js

@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.expr');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.KML');
 goog.require('ol.source.Stamen');
@@ -38,7 +38,7 @@ var vector = new ol.layer.Vector({
   style: style
 });
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.Stamen({
     layer: 'toner'
   })

examples/kml-timezones.js

@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.expr');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.KML');
 goog.require('ol.source.Stamen');
@@ -60,7 +60,7 @@ var vector = new ol.layer.Vector({
   style: style
 });
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.Stamen({
     layer: 'toner'
   })

examples/kml.js

@@ -1,14 +1,14 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.KML');
-goog.require('ol.source.TiledWMS');
+goog.require('ol.source.TileWMS');
 goog.require('ol.source.Vector');
 
-var raster = new ol.layer.TileLayer({
-  source: new ol.source.TiledWMS({
+var raster = new ol.layer.Tile({
+  source: new ol.source.TileWMS({
     url: 'http://vmap0.tiles.osgeo.org/wms/vmap0',
     crossOrigin: null,
     params: {

examples/layer-group.js

@@ -2,26 +2,26 @@ goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.LayerGroup');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Group');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.source.TileJSON');
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOpenAerial()
-    }), new ol.layer.LayerGroup({
+    }), new ol.layer.Group({
       layers: [
-        new ol.layer.TileLayer({
+        new ol.layer.Tile({
           source: new ol.source.TileJSON({
             url: 'http://api.tiles.mapbox.com/v3/' +
                 'mapbox.20110804-hoa-foodinsecurity-3month.jsonp',
             crossOrigin: 'anonymous'
           })
         }),
-        new ol.layer.TileLayer({
+        new ol.layer.Tile({
           source: new ol.source.TileJSON({
             url: 'http://api.tiles.mapbox.com/v3/' +
                 'mapbox.world-borders-light.jsonp',
@@ -51,7 +51,7 @@ function bindInputs(layerid, layer) {
 }
 map.getLayers().forEach(function(layer, i) {
   bindInputs('#layer' + i, layer);
-  if (layer instanceof ol.layer.LayerGroup) {
+  if (layer instanceof ol.layer.Group) {
     layer.getLayers().forEach(function(sublayer, j) {
       bindInputs('#layer' + i + j, sublayer);
     });

examples/localized-openstreetmap.js

@@ -2,13 +2,13 @@ goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM({
         attributions: [
           new ol.Attribution({

examples/mapquest.js

@@ -1,14 +1,14 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.MapQuestOSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOSM()
     })
   ],

examples/mobile-full-screen.js

@@ -2,7 +2,7 @@ goog.require('ol.Geolocation');
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
@@ -13,7 +13,7 @@ var view = new ol.View2D({
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
         style: 'Road'

examples/mouse-position.js

@@ -5,7 +5,7 @@ goog.require('ol.control');
 goog.require('ol.control.MousePosition');
 goog.require('ol.coordinate');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 
@@ -22,7 +22,7 @@ var mousePositionControl = new ol.control.MousePosition({
 var map = new ol.Map({
   controls: ol.control.defaults().extend([mousePositionControl]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/navigation-controls.js

@@ -3,7 +3,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ZoomToExtent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
@@ -19,7 +19,7 @@ var map = new ol.Map({
     })
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/overlay.js

@@ -3,12 +3,12 @@ goog.require('ol.Overlay');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.coordinate');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.MapQuestOpenAerial');
 
 
-var layer = new ol.layer.TileLayer({
+var layer = new ol.layer.Tile({
   source: new ol.source.MapQuestOpenAerial()
 });
 

examples/popup.js

@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.Overlay');
 goog.require('ol.View2D');
 goog.require('ol.coordinate');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.TileJSON');
 
@@ -39,7 +39,7 @@ var overlay = new ol.Overlay({
  */
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.TileJSON({
         url: 'http://api.tiles.mapbox.com/v3/' +
             'mapbox.natural-earth-hypso-bathy.jsonp',

examples/preload.js

@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
 var map1 = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       preload: Infinity,
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
@@ -25,7 +25,7 @@ var map1 = new ol.Map({
 
 var map2 = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       preload: 0, // default value
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',

examples/rotation.js

@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/scale-line.js

@@ -4,7 +4,7 @@ goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
@@ -15,7 +15,7 @@ var map = new ol.Map({
     scaleLineControl
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/select-features.js

@@ -3,7 +3,7 @@ goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.interaction');
 goog.require('ol.interaction.Select');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.ogc.GML_v3');
 goog.require('ol.source.MapQuestOpenAerial');
@@ -13,7 +13,7 @@ goog.require('ol.style.Rule');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.MapQuestOpenAerial()
 });
 

examples/semi-transparent-layer.js

@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.source.TileJSON');
@@ -9,10 +9,10 @@ goog.require('ol.source.TileJSON');
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOpenAerial()
     }),
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.TileJSON({
         url: 'http://api.tiles.mapbox.com/v3/mapbox.va-quake-aug.jsonp',
         crossOrigin: 'anonymous'

examples/side-by-side.js

@@ -1,14 +1,14 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.webgl.SUPPORTED');
 
 
 var domMap = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOpenAerial()
     })
   ],

examples/simple.js

@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/stamen.js

@@ -1,19 +1,19 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.Stamen');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.Stamen({
         layer: 'watercolor'
       })
     }),
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.Stamen({
         layer: 'terrain-labels'
       })

examples/teleport.js

@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],

examples/ten-thousand-points.js

@@ -5,10 +5,10 @@ goog.require('ol.control');
 goog.require('ol.control.MousePosition');
 goog.require('ol.geom2.LineStringCollection');
 goog.require('ol.geom2.PointCollection');
-goog.require('ol.layer.TileLayer');
-goog.require('ol.layer.VectorLayer2');
+goog.require('ol.layer.Tile');
+goog.require('ol.layer.Vector2');
 goog.require('ol.source.OSM');
-goog.require('ol.source.VectorSource2');
+goog.require('ol.source.Vector2');
 goog.require('ol.webgl.SUPPORTED');
 
 
@@ -56,11 +56,11 @@ if (!ol.webgl.SUPPORTED) {
       })
     ]),
     layers: [
-      new ol.layer.TileLayer({
+      new ol.layer.Tile({
         source: new ol.source.OSM()
       }),
-      new ol.layer.VectorLayer2({
-        source: new ol.source.VectorSource2({
+      new ol.layer.Vector2({
+        source: new ol.source.Vector2({
           lineStringCollections: [lineStringCollection],
           projection: 'EPSG:3857',
           pointCollections: [pointCollection]

examples/tilejson.js

@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.TileJSON');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.TileJSON({
         url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.jsonp',
         crossOrigin: 'anonymous'

examples/topojson.js

@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.TopoJSON');
 goog.require('ol.source.TileJSON');
@@ -11,7 +11,7 @@ goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.TileJSON({
     url: 'http://api.tiles.mapbox.com/v3/mapbox.world-dark.jsonp'
   })

examples/vector-layer.js

@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.expr');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GeoJSON');
 goog.require('ol.source.MapQuestOpenAerial');
@@ -14,7 +14,7 @@ goog.require('ol.style.Style');
 goog.require('ol.style.Text');
 
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.MapQuestOpenAerial()
 });
 

examples/wms-custom-proj.js

@@ -5,9 +5,9 @@ goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
 goog.require('ol.control.ScaleLineUnits');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
-goog.require('ol.source.TiledWMS');
+goog.require('ol.source.TileWMS');
 
 
 var projection = ol.proj.configureProj4jsProjection({
@@ -17,8 +17,8 @@ var projection = ol.proj.configureProj4jsProjection({
 
 var extent = [420000, 900000, 30000, 350000];
 var layers = [
-  new ol.layer.TileLayer({
-    source: new ol.source.TiledWMS({
+  new ol.layer.Tile({
+    source: new ol.source.TileWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: [new ol.Attribution({
@@ -34,8 +34,8 @@ var layers = [
       extent: extent
     })
   }),
-  new ol.layer.TileLayer({
-    source: new ol.source.TiledWMS({
+  new ol.layer.Tile({
+    source: new ol.source.TileWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: [new ol.Attribution({

examples/wms-no-proj.js

@@ -4,15 +4,15 @@ goog.require('ol.Projection');
 goog.require('ol.ProjectionUnits');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.ImageLayer');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Image');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.SingleImageWMS');
-goog.require('ol.source.TiledWMS');
+goog.require('ol.source.TileWMS');
 
 
 var layers = [
-  new ol.layer.TileLayer({
-    source: new ol.source.TiledWMS({
+  new ol.layer.Tile({
+    source: new ol.source.TileWMS({
       attributions: [new ol.Attribution({
         html: '© ' +
             '<a href="http://www.geo.admin.ch/internet/geoportal/' +
@@ -27,7 +27,7 @@ var layers = [
       url: 'http://wms.geo.admin.ch/'
     })
   }),
-  new ol.layer.ImageLayer({
+  new ol.layer.Image({
     source: new ol.source.SingleImageWMS({
       attributions: [new ol.Attribution({
         html: '&copy; ' +

examples/wms-single-image-custom-proj.js

@@ -2,7 +2,7 @@ goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.proj');
 goog.require('ol.source.SingleImageWMS');
 
@@ -14,7 +14,7 @@ var projection = ol.proj.configureProj4jsProjection({
 
 var extent = [420000, 900000, 30000, 350000];
 var layers = [
-  new ol.layer.ImageLayer({
+  new ol.layer.Image({
     source: new ol.source.SingleImageWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
@@ -31,7 +31,7 @@ var layers = [
       extent: extent
     })
   }),
-  new ol.layer.ImageLayer({
+  new ol.layer.Image({
     source: new ol.source.SingleImageWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',

examples/wms-single-image.js

@@ -1,17 +1,17 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.ImageLayer');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Image');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.source.SingleImageWMS');
 
 
 var layers = [
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
     source: new ol.source.MapQuestOpenAerial()
   }),
-  new ol.layer.ImageLayer({
+  new ol.layer.Image({
     source: new ol.source.SingleImageWMS({
       url: 'http://demo.opengeo.org/geoserver/wms',
       params: {'LAYERS': 'topp:states'},

examples/wms-tiled.js

@@ -1,17 +1,17 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
-goog.require('ol.source.TiledWMS');
+goog.require('ol.source.TileWMS');
 
 
 var layers = [
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
     source: new ol.source.MapQuestOpenAerial()
   }),
-  new ol.layer.TileLayer({
-    source: new ol.source.TiledWMS({
+  new ol.layer.Tile({
+    source: new ol.source.TileWMS({
       url: 'http://demo.opengeo.org/geoserver/wms',
       params: {'LAYERS': 'topp:states', 'TILED': true},
       extent: [-13884991, -7455066, 2870341, 6338219]

examples/wmts-from-capabilities.js

@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.parser.ogc.WMTSCapabilities');
 goog.require('ol.source.WMTS');
 
@@ -27,11 +27,11 @@ xhr.onload = function() {
     capabilities = parser.read(xhr.responseXML);
     map = new ol.Map({
       layers: [
-        new ol.layer.TileLayer({
+        new ol.layer.Tile({
           source: new ol.source.WMTS(ol.source.WMTS.optionsFromCapabilities(
               capabilities, 'fmzk'))
         }),
-        new ol.layer.TileLayer({
+        new ol.layer.Tile({
           source: new ol.source.WMTS(ol.source.WMTS.optionsFromCapabilities(
               capabilities, 'beschriftung'))
         })

examples/wmts-ign.js

@@ -2,7 +2,7 @@ goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.parser.ogc.WMTSCapabilities');
 goog.require('ol.source.WMTS');
 
@@ -70,7 +70,7 @@ xhr.onload = function() {
       sourceOptions.attributions = [attribution];
       sourceOptions.logo = layerLogos[i];
       source = new ol.source.WMTS(sourceOptions);
-      layer = new ol.layer.TileLayer({source: source});
+      layer = new ol.layer.Tile({source: source});
       map.addLayer(layer);
     }
 

examples/wmts.js

@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.extent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 goog.require('ol.source.WMTS');
@@ -22,11 +22,11 @@ for (var z = 0; z < 26; ++z) {
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM(),
       opacity: 0.7
     }),
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.WMTS({
         url: 'http://v2.suite.opengeo.org/geoserver/gwc/service/wmts/',
         layer: 'medford:buildings',

examples/zoomslider.js

@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.View2D');
 goog.require('ol.control.ZoomSlider');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 
 
@@ -15,7 +15,7 @@ var createMap = function(divId) {
   var source, layer, map, zoomslider, resolutions;
 
   source = new ol.source.MapQuestOpenAerial();
-  layer = new ol.layer.TileLayer({
+  layer = new ol.layer.Tile({
     source: source
   });
   map = new ol.Map({