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({
+    new ol.layer.Tile({
-      source: new ol.source.DebugTileSource({
+      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.layer.Tile');
-goog.require('ol.source.TiledWMS');
+goog.require('ol.source.TileWMS');
 
 
 var layers = [
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
-    source: new ol.source.TiledWMS({
+    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({
+var wms = new ol.layer.Tile({
-  source: new ol.source.TiledWMS({
+  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({
+var raster = new ol.layer.Tile({
-  source: new ol.source.TiledWMS({
+  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.Group');
-goog.require('ol.layer.TileLayer');
+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.Tile');
-goog.require('ol.layer.VectorLayer2');
+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({
+      new ol.layer.Vector2({
-        source: new ol.source.VectorSource2({
+        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({
+  new ol.layer.Tile({
-    source: new ol.source.TiledWMS({
+    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({
+  new ol.layer.Tile({
-    source: new ol.source.TiledWMS({
+    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.Image');
-goog.require('ol.layer.TileLayer');
+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({
+  new ol.layer.Tile({
-    source: new ol.source.TiledWMS({
+    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.Image');
-goog.require('ol.layer.TileLayer');
+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({
+  new ol.layer.Tile({
-    source: new ol.source.TiledWMS({
+    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({

src/objectliterals.jsdoc

@@ -53,7 +53,7 @@
  * @property {ol.Collection|Array.<ol.control.Control>|undefined} controls
  *     Controls initially added to the map.
  * @property {ol.Collection|undefined} interactions Interactions.
- * @property {Array.<ol.layer.LayerBase>|ol.Collection|undefined} layers Layers.
+ * @property {Array.<ol.layer.Base>|ol.Collection|undefined} layers Layers.
  * @property {ol.Collection|Array.<ol.Overlay>|undefined} overlays
  *     Overlays initially added to the map.
  * @property {ol.RendererHint|undefined} renderer Renderer.
@@ -312,7 +312,7 @@
  */
 
 /**
- * @typedef {Object} ol.layer.LayerBaseOptions
+ * @typedef {Object} ol.layer.BaseOptions
  * @property {number|undefined} brightness Brightness.
  * @property {number|undefined} contrast Contrast.
  * @property {number|undefined} hue Hue.
@@ -333,18 +333,18 @@
  */
 
 /**
- * @typedef {Object} ol.layer.LayerGroupOptions
+ * @typedef {Object} ol.layer.GroupOptions
  * @property {number|undefined} brightness Brightness.
  * @property {number|undefined} contrast Contrast.
  * @property {number|undefined} hue Hue.
  * @property {number|undefined} opacity Opacity.
  * @property {number|undefined} saturation Saturation.
  * @property {boolean|undefined} visible Visibility.
- * @property {Array.<ol.layer.LayerBase>|ol.Collection|undefined} layers Child layers.
+ * @property {Array.<ol.layer.Base>|ol.Collection|undefined} layers Child layers.
  */
 
 /**
- * @typedef {Object} ol.layer.TileLayerOptions
+ * @typedef {Object} ol.layer.TileOptions
  * @property {number|undefined} brightness Brightness.
  * @property {number|undefined} contrast Contrast.
  * @property {number|undefined} hue Hue.
@@ -457,7 +457,7 @@
  */
 
 /**
- * @typedef {Object} ol.source.DebugTileSourceOptions
+ * @typedef {Object} ol.source.TileDebugOptions
  * @property {ol.Extent|undefined} extent Extent.
  * @property {ol.ProjectionLike} projection Projection.
  * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid.
@@ -529,7 +529,7 @@
  */
 
 /**
- * @typedef {Object} ol.source.TiledWMSOptions
+ * @typedef {Object} ol.source.TileWMSOptions
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {Object.<string,*>} params WMS request parameters. At least a
  *     `LAYERS` param is required. `STYLES` is '' by default. `VERSION` is
@@ -564,7 +564,7 @@
  */
 
 /**
- * @typedef {Object} ol.source.VectorSource2Options
+ * @typedef {Object} ol.source.Vector2Options
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {ol.Extent|undefined} extent Extent.
  * @property {Array.<ol.geom2.LineStringCollection>|undefined}

src/ol/imageurlfunction.js

@@ -5,7 +5,7 @@ goog.require('ol.Size');
 
 
 /**
- * @typedef {function(this:ol.source.ImageSource, ol.Extent, ol.Size,
+ * @typedef {function(this:ol.source.Image, ol.Extent, ol.Size,
  *     ol.Projection): (string|undefined)}
  */
 ol.ImageUrlFunctionType;
@@ -22,7 +22,7 @@ ol.ImageUrlFunction.createFromParamsFunction =
     function(baseUrl, params, paramsFunction) {
   return (
       /**
-       * @this {ol.source.ImageSource}
+       * @this {ol.source.Image}
        * @param {ol.Extent} extent Extent.
        * @param {ol.Size} size Size.
        * @param {ol.Projection} projection Projection.
@@ -35,7 +35,7 @@ ol.ImageUrlFunction.createFromParamsFunction =
 
 
 /**
- * @this {ol.source.ImageSource}
+ * @this {ol.source.Image}
  * @param {ol.Extent} extent Extent.
  * @param {ol.Size} size Size.
  * @return {string|undefined} Image URL.

src/ol/layer/imagelayer.exports

@@ -1 +1 @@
-@exportClass ol.layer.ImageLayer ol.layer.LayerOptions
+@exportClass ol.layer.Image ol.layer.LayerOptions

src/ol/layer/imagelayer.js

@@ -1,7 +1,7 @@
-goog.provide('ol.layer.ImageLayer');
+goog.provide('ol.layer.Image');
 
 goog.require('ol.layer.Layer');
-goog.require('ol.source.ImageSource');
+goog.require('ol.source.Image');
 
 
 
@@ -10,15 +10,15 @@ goog.require('ol.source.ImageSource');
  * @extends {ol.layer.Layer}
  * @param {ol.layer.LayerOptions} options Layer options.
  */
-ol.layer.ImageLayer = function(options) {
+ol.layer.Image = function(options) {
   goog.base(this, options);
 };
-goog.inherits(ol.layer.ImageLayer, ol.layer.Layer);
+goog.inherits(ol.layer.Image, ol.layer.Layer);
 
 
 /**
- * @return {ol.source.ImageSource} Single image source.
+ * @return {ol.source.Image} Single image source.
  */
-ol.layer.ImageLayer.prototype.getImageSource = function() {
+ol.layer.Image.prototype.getImageSource = function() {
-  return /** @type {ol.source.ImageSource} */ (this.getSource());
+  return /** @type {ol.source.Image} */ (this.getSource());
 };

src/ol/layer/layer.js

@@ -4,14 +4,14 @@ goog.require('goog.asserts');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
 goog.require('goog.object');
-goog.require('ol.layer.LayerBase');
+goog.require('ol.layer.Base');
 goog.require('ol.source.Source');
 
 
 
 /**
  * @constructor
- * @extends {ol.layer.LayerBase}
+ * @extends {ol.layer.Base}
  * @param {ol.layer.LayerOptions} options Layer options.
  */
 ol.layer.Layer = function(options) {
@@ -37,7 +37,7 @@ ol.layer.Layer = function(options) {
   }
 
 };
-goog.inherits(ol.layer.Layer, ol.layer.LayerBase);
+goog.inherits(ol.layer.Layer, ol.layer.Base);
 
 
 /**

src/ol/layer/layerbase.js

@@ -1,4 +1,4 @@
-goog.provide('ol.layer.LayerBase');
+goog.provide('ol.layer.Base');
 goog.provide('ol.layer.LayerProperty');
 goog.provide('ol.layer.LayerState');
 
@@ -38,9 +38,9 @@ ol.layer.LayerState;
 /**
  * @constructor
  * @extends {ol.Object}
- * @param {ol.layer.LayerBaseOptions} options Layer options.
+ * @param {ol.layer.BaseOptions} options Layer options.
  */
-ol.layer.LayerBase = function(options) {
+ol.layer.Base = function(options) {
 
   goog.base(this);
 
@@ -76,13 +76,13 @@ ol.layer.LayerBase = function(options) {
       this.handleLayerVisibleChange, false, this);
 
 };
-goog.inherits(ol.layer.LayerBase, ol.Object);
+goog.inherits(ol.layer.Base, ol.Object);
 
 
 /**
  * @protected
  */
-ol.layer.LayerBase.prototype.dispatchChangeEvent = function() {
+ol.layer.Base.prototype.dispatchChangeEvent = function() {
   this.dispatchEvent(goog.events.EventType.CHANGE);
 };
 
@@ -90,43 +90,43 @@ ol.layer.LayerBase.prototype.dispatchChangeEvent = function() {
 /**
  * @return {number} Brightness.
  */
-ol.layer.LayerBase.prototype.getBrightness = function() {
+ol.layer.Base.prototype.getBrightness = function() {
   return /** @type {number} */ (this.get(ol.layer.LayerProperty.BRIGHTNESS));
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'getBrightness',
-    ol.layer.LayerBase.prototype.getBrightness);
+    ol.layer.Base.prototype.getBrightness);
 
 
 /**
  * @return {number} Contrast.
  */
-ol.layer.LayerBase.prototype.getContrast = function() {
+ol.layer.Base.prototype.getContrast = function() {
   return /** @type {number} */ (this.get(ol.layer.LayerProperty.CONTRAST));
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'getContrast',
-    ol.layer.LayerBase.prototype.getContrast);
+    ol.layer.Base.prototype.getContrast);
 
 
 /**
  * @return {number} Hue.
  */
-ol.layer.LayerBase.prototype.getHue = function() {
+ol.layer.Base.prototype.getHue = function() {
   return /** @type {number} */ (this.get(ol.layer.LayerProperty.HUE));
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'getHue',
-    ol.layer.LayerBase.prototype.getHue);
+    ol.layer.Base.prototype.getHue);
 
 
 /**
  * @return {ol.layer.LayerState} Layer state.
  */
-ol.layer.LayerBase.prototype.getLayerState = function() {
+ol.layer.Base.prototype.getLayerState = function() {
   var brightness = this.getBrightness();
   var contrast = this.getContrast();
   var hue = this.getHue();
@@ -151,7 +151,7 @@ ol.layer.LayerBase.prototype.getLayerState = function() {
  *     modified in place).
  * @return {Array.<ol.layer.Layer>} Array of layers.
  */
-ol.layer.LayerBase.prototype.getLayersArray = goog.abstractMethod;
+ol.layer.Base.prototype.getLayersArray = goog.abstractMethod;
 
 
 /**
@@ -164,49 +164,49 @@ ol.layer.LayerBase.prototype.getLayersArray = goog.abstractMethod;
  *     layerStates: Array.<ol.layer.LayerState>}} Object that store both the
  *     layers and the layerStates.
  */
-ol.layer.LayerBase.prototype.getLayerStatesArray = goog.abstractMethod;
+ol.layer.Base.prototype.getLayerStatesArray = goog.abstractMethod;
 
 
 /**
  * @return {number} Opacity.
  */
-ol.layer.LayerBase.prototype.getOpacity = function() {
+ol.layer.Base.prototype.getOpacity = function() {
   return /** @type {number} */ (this.get(ol.layer.LayerProperty.OPACITY));
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'getOpacity',
-    ol.layer.LayerBase.prototype.getOpacity);
+    ol.layer.Base.prototype.getOpacity);
 
 
 /**
  * @return {number} Saturation.
  */
-ol.layer.LayerBase.prototype.getSaturation = function() {
+ol.layer.Base.prototype.getSaturation = function() {
   return /** @type {number} */ (this.get(ol.layer.LayerProperty.SATURATION));
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'getSaturation',
-    ol.layer.LayerBase.prototype.getSaturation);
+    ol.layer.Base.prototype.getSaturation);
 
 
 /**
  * @return {boolean} Visible.
  */
-ol.layer.LayerBase.prototype.getVisible = function() {
+ol.layer.Base.prototype.getVisible = function() {
   return /** @type {boolean} */ (this.get(ol.layer.LayerProperty.VISIBLE));
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'getVisible',
-    ol.layer.LayerBase.prototype.getVisible);
+    ol.layer.Base.prototype.getVisible);
 
 
 /**
  * @protected
  */
-ol.layer.LayerBase.prototype.handleLayerChange = function() {
+ol.layer.Base.prototype.handleLayerChange = function() {
   if (this.getVisible() && this.isReady()) {
     this.dispatchChangeEvent();
   }
@@ -216,7 +216,7 @@ ol.layer.LayerBase.prototype.handleLayerChange = function() {
 /**
  * @protected
  */
-ol.layer.LayerBase.prototype.handleLayerVisibleChange = function() {
+ol.layer.Base.prototype.handleLayerVisibleChange = function() {
   if (this.isReady()) {
     this.dispatchChangeEvent();
   }
@@ -226,7 +226,7 @@ ol.layer.LayerBase.prototype.handleLayerVisibleChange = function() {
 /**
  * @return {boolean} Is ready.
  */
-ol.layer.LayerBase.prototype.isReady = goog.abstractMethod;
+ol.layer.Base.prototype.isReady = goog.abstractMethod;
 
 
 /**
@@ -249,13 +249,13 @@ ol.layer.LayerBase.prototype.isReady = goog.abstractMethod;
  *
  * @param {number} brightness Brightness.
  */
-ol.layer.LayerBase.prototype.setBrightness = function(brightness) {
+ol.layer.Base.prototype.setBrightness = function(brightness) {
   this.set(ol.layer.LayerProperty.BRIGHTNESS, brightness);
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'setBrightness',
-    ol.layer.LayerBase.prototype.setBrightness);
+    ol.layer.Base.prototype.setBrightness);
 
 
 /**
@@ -265,13 +265,13 @@ goog.exportProperty(
  *
  * @param {number} contrast Contrast.
  */
-ol.layer.LayerBase.prototype.setContrast = function(contrast) {
+ol.layer.Base.prototype.setContrast = function(contrast) {
   this.set(ol.layer.LayerProperty.CONTRAST, contrast);
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'setContrast',
-    ol.layer.LayerBase.prototype.setContrast);
+    ol.layer.Base.prototype.setContrast);
 
 
 /**
@@ -279,25 +279,25 @@ goog.exportProperty(
  * unchanged.  Other values are radians around the color circle.
  * @param {number} hue Hue.
  */
-ol.layer.LayerBase.prototype.setHue = function(hue) {
+ol.layer.Base.prototype.setHue = function(hue) {
   this.set(ol.layer.LayerProperty.HUE, hue);
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'setHue',
-    ol.layer.LayerBase.prototype.setHue);
+    ol.layer.Base.prototype.setHue);
 
 
 /**
  * @param {number} opacity Opacity.
  */
-ol.layer.LayerBase.prototype.setOpacity = function(opacity) {
+ol.layer.Base.prototype.setOpacity = function(opacity) {
   this.set(ol.layer.LayerProperty.OPACITY, opacity);
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'setOpacity',
-    ol.layer.LayerBase.prototype.setOpacity);
+    ol.layer.Base.prototype.setOpacity);
 
 
 /**
@@ -308,22 +308,22 @@ goog.exportProperty(
  *
  * @param {number} saturation Saturation.
  */
-ol.layer.LayerBase.prototype.setSaturation = function(saturation) {
+ol.layer.Base.prototype.setSaturation = function(saturation) {
   this.set(ol.layer.LayerProperty.SATURATION, saturation);
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'setSaturation',
-    ol.layer.LayerBase.prototype.setSaturation);
+    ol.layer.Base.prototype.setSaturation);
 
 
 /**
  * @param {boolean} visible Visible.
  */
-ol.layer.LayerBase.prototype.setVisible = function(visible) {
+ol.layer.Base.prototype.setVisible = function(visible) {
   this.set(ol.layer.LayerProperty.VISIBLE, visible);
 };
 goog.exportProperty(
-    ol.layer.LayerBase.prototype,
+    ol.layer.Base.prototype,
     'setVisible',
-    ol.layer.LayerBase.prototype.setVisible);
+    ol.layer.Base.prototype.setVisible);

src/ol/layer/layergroup.exports

@@ -1 +1 @@
-@exportClass ol.layer.LayerGroup ol.layer.LayerGroupOptions
+@exportClass ol.layer.Group ol.layer.GroupOptions

src/ol/layer/layergroup.js

@@ -1,4 +1,4 @@
-goog.provide('ol.layer.LayerGroup');
+goog.provide('ol.layer.Group');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
@@ -10,14 +10,13 @@ goog.require('ol.Collection');
 goog.require('ol.CollectionEvent');
 goog.require('ol.CollectionEventType');
 goog.require('ol.Object');
-goog.require('ol.layer.Layer');
+goog.require('ol.layer.Base');
-goog.require('ol.layer.LayerBase');
 
 
 /**
  * @enum {string}
  */
-ol.layer.LayerGroupProperty = {
+ol.layer.GroupProperty = {
   LAYERS: 'layers'
 };
 
@@ -25,13 +24,13 @@ ol.layer.LayerGroupProperty = {
 
 /**
  * @constructor
- * @extends {ol.layer.LayerBase}
+ * @extends {ol.layer.Base}
- * @param {ol.layer.LayerGroupOptions=} opt_options Layer options.
+ * @param {ol.layer.GroupOptions=} opt_options Layer options.
  */
-ol.layer.LayerGroup = function(opt_options) {
+ol.layer.Group = function(opt_options) {
 
   var options = goog.isDef(opt_options) ? opt_options : {};
-  var baseOptions = /** @type {ol.layer.LayerGroupOptions} */
+  var baseOptions = /** @type {ol.layer.GroupOptions} */
       (goog.object.clone(options));
   delete baseOptions.layers;
 
@@ -46,7 +45,7 @@ ol.layer.LayerGroup = function(opt_options) {
   this.listenerKeys_ = null;
 
   goog.events.listen(this,
-      ol.Object.getChangeEventType(ol.layer.LayerGroupProperty.LAYERS),
+      ol.Object.getChangeEventType(ol.layer.GroupProperty.LAYERS),
       this.handleLayersChanged_, false, this);
 
   if (goog.isDef(layers)) {
@@ -63,13 +62,13 @@ ol.layer.LayerGroup = function(opt_options) {
   this.setLayers(layers);
 
 };
-goog.inherits(ol.layer.LayerGroup, ol.layer.LayerBase);
+goog.inherits(ol.layer.Group, ol.layer.Base);
 
 
 /**
  * @inheritDoc
  */
-ol.layer.LayerGroup.prototype.handleLayerChange = function() {
+ol.layer.Group.prototype.handleLayerChange = function() {
   if (this.getVisible()) {
     this.dispatchChangeEvent();
   }
@@ -79,7 +78,7 @@ ol.layer.LayerGroup.prototype.handleLayerChange = function() {
 /**
  * @inheritDoc
  */
-ol.layer.LayerGroup.prototype.handleLayerVisibleChange = function() {
+ol.layer.Group.prototype.handleLayerVisibleChange = function() {
   this.dispatchChangeEvent();
 };
 
@@ -88,7 +87,7 @@ ol.layer.LayerGroup.prototype.handleLayerVisibleChange = function() {
  * @param {goog.events.Event} event Event.
  * @private
  */
-ol.layer.LayerGroup.prototype.handleLayersChanged_ = function(event) {
+ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
   if (!goog.isNull(this.listenerKeys_)) {
     goog.array.forEach(
         goog.object.getValues(this.listenerKeys_), goog.events.unlistenByKey);
@@ -122,8 +121,8 @@ ol.layer.LayerGroup.prototype.handleLayersChanged_ = function(event) {
  * @param {ol.CollectionEvent} collectionEvent Collection event.
  * @private
  */
-ol.layer.LayerGroup.prototype.handleLayersAdd_ = function(collectionEvent) {
+ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
-  var layer = /** @type {ol.layer.LayerBase} */ (collectionEvent.getElement());
+  var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement());
   this.listenerKeys_[goog.getUid(layer).toString()] = goog.events.listen(
       layer, goog.events.EventType.CHANGE, this.handleLayerChange, false,
       this);
@@ -135,8 +134,8 @@ ol.layer.LayerGroup.prototype.handleLayersAdd_ = function(collectionEvent) {
  * @param {ol.CollectionEvent} collectionEvent Collection event.
  * @private
  */
-ol.layer.LayerGroup.prototype.handleLayersRemove_ = function(collectionEvent) {
+ol.layer.Group.prototype.handleLayersRemove_ = function(collectionEvent) {
-  var layer = /** @type {ol.layer.LayerBase} */ (collectionEvent.getElement());
+  var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement());
   var key = goog.getUid(layer).toString();
   goog.events.unlistenByKey(this.listenerKeys_[key]);
   delete this.listenerKeys_[key];
@@ -147,32 +146,32 @@ ol.layer.LayerGroup.prototype.handleLayersRemove_ = function(collectionEvent) {
 /**
  * @return {ol.Collection} Collection of layers.
  */
-ol.layer.LayerGroup.prototype.getLayers = function() {
+ol.layer.Group.prototype.getLayers = function() {
   return /** @type {ol.Collection} */ (this.get(
-      ol.layer.LayerGroupProperty.LAYERS));
+      ol.layer.GroupProperty.LAYERS));
 };
 goog.exportProperty(
-    ol.layer.LayerGroup.prototype,
+    ol.layer.Group.prototype,
     'getLayers',
-    ol.layer.LayerGroup.prototype.getLayers);
+    ol.layer.Group.prototype.getLayers);
 
 
 /**
  * @param {ol.Collection} layers Collection of layers.
  */
-ol.layer.LayerGroup.prototype.setLayers = function(layers) {
+ol.layer.Group.prototype.setLayers = function(layers) {
-  this.set(ol.layer.LayerGroupProperty.LAYERS, layers);
+  this.set(ol.layer.GroupProperty.LAYERS, layers);
 };
 goog.exportProperty(
-    ol.layer.LayerGroup.prototype,
+    ol.layer.Group.prototype,
     'setLayers',
-    ol.layer.LayerGroup.prototype.setLayers);
+    ol.layer.Group.prototype.setLayers);
 
 
 /**
  * @inheritDoc
  */
-ol.layer.LayerGroup.prototype.getLayersArray = function(opt_array) {
+ol.layer.Group.prototype.getLayersArray = function(opt_array) {
   var array = (goog.isDef(opt_array)) ? opt_array : [];
   this.getLayers().forEach(function(layer) {
     layer.getLayersArray(array);
@@ -184,7 +183,7 @@ ol.layer.LayerGroup.prototype.getLayersArray = function(opt_array) {
 /**
  * @inheritDoc
  */
-ol.layer.LayerGroup.prototype.getLayerStatesArray = function(opt_obj) {
+ol.layer.Group.prototype.getLayerStatesArray = function(opt_obj) {
   var obj = (goog.isDef(opt_obj)) ? opt_obj : {
     layers: [],
     layerStates: []
@@ -216,7 +215,7 @@ ol.layer.LayerGroup.prototype.getLayerStatesArray = function(opt_obj) {
 /**
  * @inheritDoc
  */
-ol.layer.LayerGroup.prototype.isReady = function() {
+ol.layer.Group.prototype.isReady = function() {
   return null === goog.array.find(
       this.getLayers().getArray(), function(elt, index, array) {
         return !elt.isReady();

src/ol/layer/tilelayer.exports

@@ -1 +1 @@
-@exportClass ol.layer.TileLayer ol.layer.TileLayerOptions
+@exportClass ol.layer.Tile ol.layer.TileOptions

src/ol/layer/tilelayer.js

@@ -1,13 +1,13 @@
-goog.provide('ol.layer.TileLayer');
+goog.provide('ol.layer.Tile');
 
 goog.require('ol.layer.Layer');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 
 
 /**
  * @enum {string}
  */
-ol.layer.TileLayerProperty = {
+ol.layer.TileProperty = {
   PRELOAD: 'preload'
 };
 
@@ -16,9 +16,9 @@ ol.layer.TileLayerProperty = {
 /**
  * @constructor
  * @extends {ol.layer.Layer}
- * @param {ol.layer.TileLayerOptions} options Tile layer options.
+ * @param {ol.layer.TileOptions} options Tile layer options.
  */
-ol.layer.TileLayer = function(options) {
+ol.layer.Tile = function(options) {
 
   goog.base(this, options);
 
@@ -26,36 +26,36 @@ ol.layer.TileLayer = function(options) {
       goog.isDef(options.preload) ? options.preload : 0);
 
 };
-goog.inherits(ol.layer.TileLayer, ol.layer.Layer);
+goog.inherits(ol.layer.Tile, ol.layer.Layer);
 
 
 /**
  * @return {number} Preload.
  */
-ol.layer.TileLayer.prototype.getPreload = function() {
+ol.layer.Tile.prototype.getPreload = function() {
-  return /** @type {number} */ (this.get(ol.layer.TileLayerProperty.PRELOAD));
+  return /** @type {number} */ (this.get(ol.layer.TileProperty.PRELOAD));
 };
 goog.exportProperty(
-    ol.layer.TileLayer.prototype,
+    ol.layer.Tile.prototype,
     'getPreload',
-    ol.layer.TileLayer.prototype.getPreload);
+    ol.layer.Tile.prototype.getPreload);
 
 
 /**
- * @return {ol.source.TileSource} Source.
+ * @return {ol.source.Tile} Source.
  */
-ol.layer.TileLayer.prototype.getTileSource = function() {
+ol.layer.Tile.prototype.getTileSource = function() {
-  return /** @type {ol.source.TileSource} */ (this.getSource());
+  return /** @type {ol.source.Tile} */ (this.getSource());
 };
 
 
 /**
  * @param {number} preload Preload.
  */
-ol.layer.TileLayer.prototype.setPreload = function(preload) {
+ol.layer.Tile.prototype.setPreload = function(preload) {
-  this.set(ol.layer.TileLayerProperty.PRELOAD, preload);
+  this.set(ol.layer.TileProperty.PRELOAD, preload);
 };
 goog.exportProperty(
-    ol.layer.TileLayer.prototype,
+    ol.layer.Tile.prototype,
     'setPreload',
-    ol.layer.TileLayer.prototype.setPreload);
+    ol.layer.Tile.prototype.setPreload);

src/ol/layer/vectorlayer2.exports

@@ -1 +1 @@
-@exportSymbol ol.layer.VectorLayer2
+@exportSymbol ol.layer.Vector2

src/ol/layer/vectorlayer2.js

@@ -1,7 +1,7 @@
-goog.provide('ol.layer.VectorLayer2');
+goog.provide('ol.layer.Vector2');
 
 goog.require('ol.layer.Layer');
-goog.require('ol.source.VectorSource2');
+goog.require('ol.source.Vector2');
 
 
 
@@ -11,15 +11,15 @@ goog.require('ol.source.VectorSource2');
  * @extends {ol.layer.Layer}
  * @param {ol.layer.LayerOptions} options Options.
  */
-ol.layer.VectorLayer2 = function(options) {
+ol.layer.Vector2 = function(options) {
   goog.base(this, options);
 };
-goog.inherits(ol.layer.VectorLayer2, ol.layer.Layer);
+goog.inherits(ol.layer.Vector2, ol.layer.Layer);
 
 
 /**
- * @return {ol.source.VectorSource2} Source.
+ * @return {ol.source.Vector2} Source.
  */
-ol.layer.VectorLayer2.prototype.getVectorSource = function() {
+ol.layer.Vector2.prototype.getVectorSource = function() {
-  return /** @type {ol.source.VectorSource2} */ (this.getSource());
+  return /** @type {ol.source.Vector2} */ (this.getSource());
 };

src/ol/map.js

@@ -53,8 +53,8 @@ goog.require('ol.ViewHint');
 goog.require('ol.control');
 goog.require('ol.extent');
 goog.require('ol.interaction');
-goog.require('ol.layer.LayerBase');
+goog.require('ol.layer.Base');
-goog.require('ol.layer.LayerGroup');
+goog.require('ol.layer.Group');
 goog.require('ol.proj');
 goog.require('ol.proj.common');
 goog.require('ol.renderer.Map');
@@ -129,7 +129,7 @@ ol.MapProperty = {
  *         zoom: 1
  *       }),
  *       layers: [
- *         new ol.layer.TileLayer({
+ *         new ol.layer.Tile({
  *           source: new ol.source.MapQuestOSM()
  *         })
  *       ],
@@ -366,7 +366,7 @@ ol.Map.prototype.addControl = function(control) {
 
 /**
  * Adds the given layer to the top of this map.
- * @param {ol.layer.LayerBase} layer Layer.
+ * @param {ol.layer.Base} layer Layer.
  */
 ol.Map.prototype.addLayer = function(layer) {
   var layers = this.getLayerGroup().getLayers();
@@ -519,10 +519,10 @@ ol.Map.prototype.getInteractions = function() {
 
 /**
  * Get the layergroup associated with this map.
- * @return {ol.layer.LayerGroup} LayerGroup.
+ * @return {ol.layer.Group} LayerGroup.
  */
 ol.Map.prototype.getLayerGroup = function() {
-  return /** @type {ol.layer.LayerGroup} */ (
+  return /** @type {ol.layer.Group} */ (
       this.get(ol.MapProperty.LAYERGROUP));
 };
 goog.exportProperty(
@@ -874,14 +874,14 @@ ol.Map.prototype.removeControl = function(control) {
 
 /**
  * Removes the given layer from the map.
- * @param {ol.layer.LayerBase} layer Layer.
+ * @param {ol.layer.Base} layer Layer.
- * @return {ol.layer.LayerBase|undefined} The removed layer or undefined if the
+ * @return {ol.layer.Base|undefined} The removed layer or undefined if the
  *     layer was not found.
  */
 ol.Map.prototype.removeLayer = function(layer) {
   var layers = this.getLayerGroup().getLayers();
   goog.asserts.assert(goog.isDef(layers));
-  return /** @type {ol.layer.LayerBase|undefined} */ (layers.remove(layer));
+  return /** @type {ol.layer.Base|undefined} */ (layers.remove(layer));
 };
 
 
@@ -993,7 +993,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
 
 /**
  * Sets the layergroup of this map.
- * @param {ol.layer.LayerGroup} layerGroup Layergroup.
+ * @param {ol.layer.Group} layerGroup Layergroup.
  */
 ol.Map.prototype.setLayerGroup = function(layerGroup) {
   this.set(ol.MapProperty.LAYERGROUP, layerGroup);
@@ -1113,8 +1113,8 @@ ol.Map.createOptionsInternal = function(options) {
    */
   var values = {};
 
-  var layerGroup = (options.layers instanceof ol.layer.LayerGroup) ?
+  var layerGroup = (options.layers instanceof ol.layer.Group) ?
-      options.layers : new ol.layer.LayerGroup({layers: options.layers});
+      options.layers : new ol.layer.Group({layers: options.layers});
   values[ol.MapProperty.LAYERGROUP] = layerGroup;
 
   values[ol.MapProperty.TARGET] = options.target;

src/ol/renderer/canvas/canvasimagelayerrenderer.js

@@ -6,7 +6,7 @@ goog.require('goog.vec.Mat4');
 goog.require('ol.Image');
 goog.require('ol.ImageState');
 goog.require('ol.ViewHint');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.Layer');
 
@@ -16,7 +16,7 @@ goog.require('ol.renderer.canvas.Layer');
  * @constructor
  * @extends {ol.renderer.canvas.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.ImageLayer} imageLayer Single image layer.
+ * @param {ol.layer.Image} imageLayer Single image layer.
  */
 ol.renderer.canvas.ImageLayer = function(mapRenderer, imageLayer) {
 
@@ -49,10 +49,10 @@ ol.renderer.canvas.ImageLayer.prototype.getImage = function() {
 
 /**
  * @protected
- * @return {ol.layer.ImageLayer} Single image layer.
+ * @return {ol.layer.Image} Single image layer.
  */
 ol.renderer.canvas.ImageLayer.prototype.getImageLayer = function() {
-  return /** @type {ol.layer.ImageLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Image} */ (this.getLayer());
 };
 
 

src/ol/renderer/canvas/canvasmaprenderer.js

@@ -9,8 +9,8 @@ goog.require('goog.style');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Size');
 goog.require('ol.css');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.ImageLayer');
@@ -66,9 +66,9 @@ goog.inherits(ol.renderer.canvas.Map, ol.renderer.Map);
  * @inheritDoc
  */
 ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) {
-  if (layer instanceof ol.layer.ImageLayer) {
+  if (layer instanceof ol.layer.Image) {
     return new ol.renderer.canvas.ImageLayer(this, layer);
-  } else if (layer instanceof ol.layer.TileLayer) {
+  } else if (layer instanceof ol.layer.Tile) {
     return new ol.renderer.canvas.TileLayer(this, layer);
   } else if (layer instanceof ol.layer.Vector) {
     return new ol.renderer.canvas.VectorLayer(this, layer);

src/ol/renderer/canvas/canvastilelayerrenderer.js

@@ -15,7 +15,7 @@ goog.require('ol.TileCoord');
 goog.require('ol.TileRange');
 goog.require('ol.TileState');
 goog.require('ol.extent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.Layer');
 
@@ -25,7 +25,7 @@ goog.require('ol.renderer.canvas.Layer');
  * @constructor
  * @extends {ol.renderer.canvas.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.TileLayer} tileLayer Tile layer.
+ * @param {ol.layer.Tile} tileLayer Tile layer.
  */
 ol.renderer.canvas.TileLayer = function(mapRenderer, tileLayer) {
 
@@ -87,10 +87,10 @@ ol.renderer.canvas.TileLayer.prototype.getImage = function() {
 
 /**
  * @protected
- * @return {ol.layer.TileLayer} Tile layer.
+ * @return {ol.layer.Tile} Tile layer.
  */
 ol.renderer.canvas.TileLayer.prototype.getTileLayer = function() {
-  return /** @type {ol.layer.TileLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Tile} */ (this.getLayer());
 };
 
 

src/ol/renderer/dom/domimagelayerrenderer.js

@@ -9,7 +9,7 @@ goog.require('ol.Image');
 goog.require('ol.ImageState');
 goog.require('ol.ViewHint');
 goog.require('ol.dom');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.renderer.dom.Layer');
 
 
@@ -18,7 +18,7 @@ goog.require('ol.renderer.dom.Layer');
  * @constructor
  * @extends {ol.renderer.dom.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.ImageLayer} imageLayer Image layer.
+ * @param {ol.layer.Image} imageLayer Image layer.
  */
 ol.renderer.dom.ImageLayer = function(mapRenderer, imageLayer) {
   var target = goog.dom.createElement(goog.dom.TagName.DIV);
@@ -45,10 +45,10 @@ goog.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer);
 
 /**
  * @protected
- * @return {ol.layer.ImageLayer} Image layer.
+ * @return {ol.layer.Image} Image layer.
  */
 ol.renderer.dom.ImageLayer.prototype.getImageLayer = function() {
-  return /** @type {ol.layer.ImageLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Image} */ (this.getLayer());
 };
 
 

src/ol/renderer/dom/dommaprenderer.js

@@ -5,8 +5,8 @@ goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.style');
 goog.require('ol.css');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.dom.ImageLayer');
 goog.require('ol.renderer.dom.TileLayer');
@@ -51,9 +51,9 @@ goog.inherits(ol.renderer.dom.Map, ol.renderer.Map);
  */
 ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) {
   var layerRenderer;
-  if (layer instanceof ol.layer.TileLayer) {
+  if (layer instanceof ol.layer.Tile) {
     layerRenderer = new ol.renderer.dom.TileLayer(this, layer);
-  } else if (layer instanceof ol.layer.ImageLayer) {
+  } else if (layer instanceof ol.layer.Image) {
     layerRenderer = new ol.renderer.dom.ImageLayer(this, layer);
   } else {
     goog.asserts.fail();

src/ol/renderer/dom/domtilelayerrenderer.js

@@ -18,7 +18,7 @@ goog.require('ol.TileState');
 goog.require('ol.ViewHint');
 goog.require('ol.dom');
 goog.require('ol.extent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.renderer.dom.Layer');
 goog.require('ol.tilegrid.TileGrid');
 
@@ -28,7 +28,7 @@ goog.require('ol.tilegrid.TileGrid');
  * @constructor
  * @extends {ol.renderer.dom.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.TileLayer} tileLayer Tile layer.
+ * @param {ol.layer.Tile} tileLayer Tile layer.
  */
 ol.renderer.dom.TileLayer = function(mapRenderer, tileLayer) {
 
@@ -61,10 +61,10 @@ goog.inherits(ol.renderer.dom.TileLayer, ol.renderer.dom.Layer);
 
 /**
  * @protected
- * @return {ol.layer.TileLayer} Tile layer.
+ * @return {ol.layer.Tile} Tile layer.
  */
 ol.renderer.dom.TileLayer.prototype.getTileLayer = function() {
-  return /** @type {ol.layer.TileLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Tile} */ (this.getLayer());
 };
 
 

src/ol/renderer/layerrenderer.js

@@ -10,7 +10,7 @@ goog.require('ol.TileState');
 goog.require('ol.layer.Layer');
 goog.require('ol.layer.LayerState');
 goog.require('ol.source.Source');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 
 
 
@@ -121,7 +121,7 @@ ol.renderer.Layer.prototype.renderIfReadyAndVisible = function() {
 
 /**
  * @param {ol.FrameState} frameState Frame state.
- * @param {ol.source.TileSource} tileSource Tile source.
+ * @param {ol.source.Tile} tileSource Tile source.
  * @protected
  */
 ol.renderer.Layer.prototype.scheduleExpireCache =
@@ -169,7 +169,7 @@ ol.renderer.Layer.prototype.updateLogos = function(frameState, source) {
 
 /**
  * @param {Object.<string, Object.<string, ol.TileRange>>} usedTiles Used tiles.
- * @param {ol.source.TileSource} tileSource Tile source.
+ * @param {ol.source.Tile} tileSource Tile source.
  * @param {number} z Z.
  * @param {ol.TileRange} tileRange Tile range.
  * @protected
@@ -195,7 +195,7 @@ ol.renderer.Layer.prototype.updateUsedTiles =
 /**
  * @param {function(ol.Tile): boolean} isLoadedFunction Function to
  *     determine if the tile is loaded.
- * @param {ol.source.TileSource} tileSource Tile source.
+ * @param {ol.source.Tile} tileSource Tile source.
  * @param {ol.Projection} projection Projection.
  * @protected
  * @return {function(number, number, number): ol.Tile} Returns a tile if it is
@@ -241,7 +241,7 @@ ol.renderer.Layer.prototype.snapCenterToPixel =
  *   discarded by the tile queue
  * - enqueues missing tiles
  * @param {ol.FrameState} frameState Frame state.
- * @param {ol.source.TileSource} tileSource Tile source.
+ * @param {ol.source.Tile} tileSource Tile source.
  * @param {ol.tilegrid.TileGrid} tileGrid Tile grid.
  * @param {ol.Projection} projection Projection.
  * @param {ol.Extent} extent Extent.

src/ol/renderer/webgl/webglimagelayerrenderer.js

@@ -10,7 +10,7 @@ goog.require('ol.Extent');
 goog.require('ol.Image');
 goog.require('ol.ImageState');
 goog.require('ol.ViewHint');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.renderer.webgl.Layer');
 
 
@@ -19,7 +19,7 @@ goog.require('ol.renderer.webgl.Layer');
  * @constructor
  * @extends {ol.renderer.webgl.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.ImageLayer} imageLayer Tile layer.
+ * @param {ol.layer.Image} imageLayer Tile layer.
  */
 ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) {
 
@@ -73,10 +73,10 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
 
 /**
  * @protected
- * @return {ol.layer.ImageLayer} Tile layer.
+ * @return {ol.layer.Image} Tile layer.
  */
 ol.renderer.webgl.ImageLayer.prototype.getImageLayer = function() {
-  return /** @type {ol.layer.ImageLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Image} */ (this.getLayer());
 };
 
 

src/ol/renderer/webgl/webglmaprenderer.js

@@ -17,9 +17,9 @@ goog.require('ol.FrameState');
 goog.require('ol.Size');
 goog.require('ol.Tile');
 goog.require('ol.css');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
-goog.require('ol.layer.VectorLayer2');
+goog.require('ol.layer.Vector2');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.webgl.ImageLayer');
 goog.require('ol.renderer.webgl.TileLayer');
@@ -299,11 +299,11 @@ ol.renderer.webgl.Map.prototype.bindTileTexture =
  * @inheritDoc
  */
 ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
-  if (layer instanceof ol.layer.TileLayer) {
+  if (layer instanceof ol.layer.Tile) {
     return new ol.renderer.webgl.TileLayer(this, layer);
-  } else if (layer instanceof ol.layer.ImageLayer) {
+  } else if (layer instanceof ol.layer.Image) {
     return new ol.renderer.webgl.ImageLayer(this, layer);
-  } else if (layer instanceof ol.layer.VectorLayer2) {
+  } else if (layer instanceof ol.layer.Vector2) {
     return new ol.renderer.webgl.VectorLayer2(this, layer);
   } else {
     goog.asserts.fail();

src/ol/renderer/webgl/webgltilelayerrenderer.js

@@ -12,7 +12,7 @@ goog.require('ol.Tile');
 goog.require('ol.TileRange');
 goog.require('ol.TileState');
 goog.require('ol.extent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.math');
 goog.require('ol.renderer.webgl.Layer');
 goog.require('ol.renderer.webgl.tilelayer.shader');
@@ -24,7 +24,7 @@ goog.require('ol.structs.Buffer');
  * @constructor
  * @extends {ol.renderer.webgl.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.TileLayer} tileLayer Tile layer.
+ * @param {ol.layer.Tile} tileLayer Tile layer.
  */
 ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
 
@@ -88,10 +88,10 @@ ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
 
 /**
  * @protected
- * @return {ol.layer.TileLayer} Tile layer.
+ * @return {ol.layer.Tile} Tile layer.
  */
 ol.renderer.webgl.TileLayer.prototype.getTileLayer = function() {
-  return /** @type {ol.layer.TileLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Tile} */ (this.getLayer());
 };
 
 

src/ol/renderer/webgl/webglvectorlayer2renderer.js

@@ -13,7 +13,7 @@ goog.require('ol.renderer.webgl.vectorlayer2.shader.PointCollection');
  * @constructor
  * @extends {ol.renderer.webgl.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.VectorLayer2} vectorLayer2 Vector layer.
+ * @param {ol.layer.Vector2} vectorLayer2 Vector layer.
  */
 ol.renderer.webgl.VectorLayer2 = function(mapRenderer, vectorLayer2) {
 
@@ -45,10 +45,10 @@ goog.inherits(ol.renderer.webgl.VectorLayer2, ol.renderer.webgl.Layer);
 
 
 /**
- * @return {ol.layer.VectorLayer2} Vector layer.
+ * @return {ol.layer.Vector2} Vector layer.
  */
 ol.renderer.webgl.VectorLayer2.prototype.getVectorLayer = function() {
-  return /** @type {ol.layer.VectorLayer2} */ (this.getLayer());
+  return /** @type {ol.layer.Vector2} */ (this.getLayer());
 };
 
 

src/ol/source/bingmapssource.js

@@ -9,14 +9,14 @@ goog.require('ol.TileRange');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.extent');
 goog.require('ol.proj');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.XYZ');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @param {ol.source.BingMapsOptions} options Bing Maps options.
  */
 ol.source.BingMaps = function(options) {
@@ -48,7 +48,7 @@ ol.source.BingMaps = function(options) {
   }, goog.bind(this.handleImageryMetadataResponse, this));
 
 };
-goog.inherits(ol.source.BingMaps, ol.source.ImageTileSource);
+goog.inherits(ol.source.BingMaps, ol.source.TileImage);
 
 
 /**

src/ol/source/debugtilesource.exports

@@ -1 +1 @@
-@exportClass ol.source.DebugTileSource ol.source.DebugTileSourceOptions
+@exportClass ol.source.TileDebug ol.source.TileDebugOptions

src/ol/source/debugtilesource.js

@@ -1,4 +1,4 @@
-goog.provide('ol.source.DebugTileSource');
+goog.provide('ol.source.TileDebug');
 
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
@@ -7,7 +7,7 @@ goog.require('ol.Tile');
 goog.require('ol.TileCache');
 goog.require('ol.TileCoord');
 goog.require('ol.TileState');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 goog.require('ol.tilegrid.TileGrid');
 
 
@@ -83,10 +83,10 @@ ol.DebugTile_.prototype.getImage = function(opt_context) {
 
 /**
  * @constructor
- * @extends {ol.source.TileSource}
+ * @extends {ol.source.Tile}
- * @param {ol.source.DebugTileSourceOptions} options Debug tile options.
+ * @param {ol.source.TileDebugOptions} options Debug tile options.
  */
-ol.source.DebugTileSource = function(options) {
+ol.source.TileDebug = function(options) {
 
   goog.base(this, {
     extent: options.extent,
@@ -102,13 +102,13 @@ ol.source.DebugTileSource = function(options) {
   this.tileCache_ = new ol.TileCache();
 
 };
-goog.inherits(ol.source.DebugTileSource, ol.source.TileSource);
+goog.inherits(ol.source.TileDebug, ol.source.Tile);
 
 
 /**
  * @inheritDoc
  */
-ol.source.DebugTileSource.prototype.canExpireCache = function() {
+ol.source.TileDebug.prototype.canExpireCache = function() {
   return this.tileCache_.canExpireCache();
 };
 
@@ -116,7 +116,7 @@ ol.source.DebugTileSource.prototype.canExpireCache = function() {
 /**
  * @inheritDoc
  */
-ol.source.DebugTileSource.prototype.expireCache = function(usedTiles) {
+ol.source.TileDebug.prototype.expireCache = function(usedTiles) {
   this.tileCache_.expireCache(usedTiles);
 };
 
@@ -124,7 +124,7 @@ ol.source.DebugTileSource.prototype.expireCache = function(usedTiles) {
 /**
  * @inheritDoc
  */
-ol.source.DebugTileSource.prototype.getTile = function(z, x, y) {
+ol.source.TileDebug.prototype.getTile = function(z, x, y) {
   var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y);
   if (this.tileCache_.containsKey(tileCoordKey)) {
     return /** @type {!ol.DebugTile_} */ (this.tileCache_.get(tileCoordKey));

src/ol/source/imagesource.js

@@ -1,4 +1,4 @@
-goog.provide('ol.source.ImageSource');
+goog.provide('ol.source.Image');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
@@ -23,16 +23,16 @@ goog.require('ol.source.Source');
  *            imageUrlFunction: (ol.ImageUrlFunctionType|
  *                undefined)}}
  */
-ol.source.ImageSourceOptions;
+ol.source.ImageOptions;
 
 
 
 /**
  * @constructor
  * @extends {ol.source.Source}
- * @param {ol.source.ImageSourceOptions} options Single image source options.
+ * @param {ol.source.ImageOptions} options Single image source options.
  */
-ol.source.ImageSource = function(options) {
+ol.source.Image = function(options) {
 
   goog.base(this, {
     attributions: options.attributions,
@@ -70,7 +70,7 @@ ol.source.ImageSource = function(options) {
           }, true));
 
 };
-goog.inherits(ol.source.ImageSource, ol.source.Source);
+goog.inherits(ol.source.Image, ol.source.Source);
 
 
 /**
@@ -81,7 +81,7 @@ goog.inherits(ol.source.ImageSource, ol.source.Source);
  * @param {ol.Projection} projection Projection.
  * @return {ol.Image} Single image.
  */
-ol.source.ImageSource.prototype.createImage =
+ol.source.Image.prototype.createImage =
     function(extent, resolution, size, projection) {
   var image = null;
   var imageUrl = this.imageUrlFunction(extent, size, projection);
@@ -99,7 +99,7 @@ ol.source.ImageSource.prototype.createImage =
  * @param {number} resolution Resolution.
  * @return {number} Resolution.
  */
-ol.source.ImageSource.prototype.findNearestResolution =
+ol.source.Image.prototype.findNearestResolution =
     function(resolution) {
   if (!goog.isNull(this.resolutions_)) {
     var idx = ol.array.linearFindNearest(this.resolutions_, resolution, 0);
@@ -115,4 +115,4 @@ ol.source.ImageSource.prototype.findNearestResolution =
  * @param {ol.Projection} projection Projection.
  * @return {ol.Image} Single image.
  */
-ol.source.ImageSource.prototype.getImage = goog.abstractMethod;
+ol.source.Image.prototype.getImage = goog.abstractMethod;

src/ol/source/imagetilesource.js

@@ -1,4 +1,4 @@
-goog.provide('ol.source.ImageTileSource');
+goog.provide('ol.source.TileImage');
 
 goog.require('goog.asserts');
 goog.require('ol.Attribution');
@@ -11,7 +11,7 @@ goog.require('ol.TileCoord');
 goog.require('ol.TileState');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.TileUrlFunctionType');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 goog.require('ol.tilegrid.TileGrid');
 
 
@@ -31,10 +31,10 @@ ol.source.ImageTileOptions;
 
 /**
  * @constructor
- * @extends {ol.source.TileSource}
+ * @extends {ol.source.Tile}
  * @param {ol.source.ImageTileOptions} options Image tile options.
  */
-ol.source.ImageTileSource = function(options) {
+ol.source.TileImage = function(options) {
 
   goog.base(this, {
     attributions: options.attributions,
@@ -67,13 +67,13 @@ ol.source.ImageTileSource = function(options) {
   this.tileCache_ = new ol.TileCache();
 
 };
-goog.inherits(ol.source.ImageTileSource, ol.source.TileSource);
+goog.inherits(ol.source.TileImage, ol.source.Tile);
 
 
 /**
  * @inheritDoc
  */
-ol.source.ImageTileSource.prototype.canExpireCache = function() {
+ol.source.TileImage.prototype.canExpireCache = function() {
   return this.tileCache_.canExpireCache();
 };
 
@@ -81,7 +81,7 @@ ol.source.ImageTileSource.prototype.canExpireCache = function() {
 /**
  * @inheritDoc
  */
-ol.source.ImageTileSource.prototype.expireCache = function(usedTiles) {
+ol.source.TileImage.prototype.expireCache = function(usedTiles) {
   this.tileCache_.expireCache(usedTiles);
 };
 
@@ -89,7 +89,7 @@ ol.source.ImageTileSource.prototype.expireCache = function(usedTiles) {
 /**
  * @inheritDoc
  */
-ol.source.ImageTileSource.prototype.getTile = function(z, x, y, projection) {
+ol.source.TileImage.prototype.getTile = function(z, x, y, projection) {
   var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y);
   if (this.tileCache_.containsKey(tileCoordKey)) {
     return /** @type {!ol.Tile} */ (this.tileCache_.get(tileCoordKey));
@@ -111,7 +111,7 @@ ol.source.ImageTileSource.prototype.getTile = function(z, x, y, projection) {
 /**
  * @inheritDoc
  */
-ol.source.ImageTileSource.prototype.useTile = function(z, x, y) {
+ol.source.TileImage.prototype.useTile = function(z, x, y) {
   var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y);
   if (this.tileCache_.containsKey(tileCoordKey)) {
     this.tileCache_.get(tileCoordKey);

src/ol/source/singleimagewmssource.js

@@ -5,14 +5,14 @@ goog.require('ol.Image');
 goog.require('ol.ImageUrlFunction');
 goog.require('ol.extent');
 goog.require('ol.source.FeatureInfoSource');
-goog.require('ol.source.ImageSource');
+goog.require('ol.source.Image');
 goog.require('ol.source.wms');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.ImageSource}
+ * @extends {ol.source.Image}
  * @implements {ol.source.FeatureInfoSource}
  * @param {ol.source.SingleImageWMSOptions} options Options.
  */
@@ -52,7 +52,7 @@ ol.source.SingleImageWMS = function(options) {
       options.ratio : 1.5;
 
 };
-goog.inherits(ol.source.SingleImageWMS, ol.source.ImageSource);
+goog.inherits(ol.source.SingleImageWMS, ol.source.Image);
 
 
 /**

src/ol/source/staticimagesource.js

@@ -4,13 +4,13 @@ goog.require('ol.Image');
 goog.require('ol.ImageUrlFunctionType');
 goog.require('ol.extent');
 goog.require('ol.proj');
-goog.require('ol.source.ImageSource');
+goog.require('ol.source.Image');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.ImageSource}
+ * @extends {ol.source.Image}
  * @param {ol.source.StaticImageOptions} options Static image options.
  */
 ol.source.StaticImage = function(options) {
@@ -40,7 +40,7 @@ ol.source.StaticImage = function(options) {
       imageExtent, imageResolution, imageSize, projection);
 
 };
-goog.inherits(ol.source.StaticImage, ol.source.ImageSource);
+goog.inherits(ol.source.StaticImage, ol.source.Image);
 
 
 /**

src/ol/source/tiledwmssource.exports

@@ -1 +1 @@
-@exportClass ol.source.TiledWMS ol.source.TiledWMSOptions
+@exportClass ol.source.TileWMS ol.source.TileWMSOptions

src/ol/source/tiledwmssource.js

@@ -1,6 +1,6 @@
 // FIXME add minZoom support
 
-goog.provide('ol.source.TiledWMS');
+goog.provide('ol.source.TileWMS');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
@@ -9,18 +9,18 @@ goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.extent');
 goog.require('ol.source.FeatureInfoSource');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.source.wms');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @implements {ol.source.FeatureInfoSource}
- * @param {ol.source.TiledWMSOptions} options Tiled WMS options.
+ * @param {ol.source.TileWMSOptions} options Tiled WMS options.
  */
-ol.source.TiledWMS = function(options) {
+ol.source.TileWMS = function(options) {
 
   var tileGrid;
   if (goog.isDef(options.tileGrid)) {
@@ -94,13 +94,13 @@ ol.source.TiledWMS = function(options) {
       options.getFeatureInfoOptions : {};
 
 };
-goog.inherits(ol.source.TiledWMS, ol.source.ImageTileSource);
+goog.inherits(ol.source.TileWMS, ol.source.TileImage);
 
 
 /**
  * @inheritDoc
  */
-ol.source.TiledWMS.prototype.getFeatureInfoForPixel =
+ol.source.TileWMS.prototype.getFeatureInfoForPixel =
     function(pixel, map, success, opt_error) {
   var coord = map.getCoordinateFromPixel(pixel),
       view2D = map.getView().getView2D(),
@@ -113,7 +113,7 @@ ol.source.TiledWMS.prototype.getFeatureInfoForPixel =
       offset = map.getPixelFromCoordinate(ol.extent.getTopLeft(tileExtent)),
       url = this.tileUrlFunction(tileCoord, projection);
   goog.asserts.assert(goog.isDef(url),
-      'ol.source.TiledWMS#tileUrlFunction does not return a url');
+      'ol.source.TileWMS#tileUrlFunction does not return a url');
   ol.source.wms.getFeatureInfo(url,
       [pixel[0] - offset[0], pixel[1] - offset[1]], this.getFeatureInfoOptions_,
       success, opt_error);

src/ol/source/tilejsonsource.js

@@ -15,7 +15,7 @@ goog.require('ol.TileRange');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.extent');
 goog.require('ol.proj');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.XYZ');
 
 
@@ -38,7 +38,7 @@ goog.exportSymbol('grid', grid);
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @param {ol.source.TileJSONOptions} options TileJSON options.
  */
 ol.source.TileJSON = function(options) {
@@ -62,7 +62,7 @@ ol.source.TileJSON = function(options) {
   this.deferred_.addCallback(this.handleTileJSONResponse, this);
 
 };
-goog.inherits(ol.source.TileJSON, ol.source.ImageTileSource);
+goog.inherits(ol.source.TileJSON, ol.source.TileImage);
 
 
 /**

src/ol/source/tilesource.exports

@@ -1,2 +1,2 @@
-@exportSymbol ol.source.TileSource
+@exportSymbol ol.source.Tile
-@exportProperty ol.source.TileSource.prototype.getTileGrid
+@exportProperty ol.source.Tile.prototype.getTileGrid

src/ol/source/tilesource.js

@@ -1,5 +1,5 @@
-goog.provide('ol.source.TileSource');
+goog.provide('ol.source.Tile');
-goog.provide('ol.source.TileSourceOptions');
+goog.provide('ol.source.TileOptions');
 
 goog.require('goog.functions');
 goog.require('ol.Attribution');
@@ -19,16 +19,16 @@ goog.require('ol.tilegrid.TileGrid');
  *            projection: ol.ProjectionLike,
  *            tileGrid: (ol.tilegrid.TileGrid|undefined)}}
  */
-ol.source.TileSourceOptions;
+ol.source.TileOptions;
 
 
 
 /**
  * @constructor
  * @extends {ol.source.Source}
- * @param {ol.source.TileSourceOptions} options Tile source options.
+ * @param {ol.source.TileOptions} options Tile source options.
  */
-ol.source.TileSource = function(options) {
+ol.source.Tile = function(options) {
 
   goog.base(this, {
     attributions: options.attributions,
@@ -50,19 +50,19 @@ ol.source.TileSource = function(options) {
   this.tileGrid = goog.isDef(options.tileGrid) ? options.tileGrid : null;
 
 };
-goog.inherits(ol.source.TileSource, ol.source.Source);
+goog.inherits(ol.source.Tile, ol.source.Source);
 
 
 /**
  * @return {boolean} Can expire cache.
  */
-ol.source.TileSource.prototype.canExpireCache = goog.functions.FALSE;
+ol.source.Tile.prototype.canExpireCache = goog.functions.FALSE;
 
 
 /**
  * @param {Object.<string, ol.TileRange>} usedTiles Used tiles.
  */
-ol.source.TileSource.prototype.expireCache = goog.abstractMethod;
+ol.source.Tile.prototype.expireCache = goog.abstractMethod;
 
 
 /**
@@ -78,7 +78,7 @@ ol.source.TileSource.prototype.expireCache = goog.abstractMethod;
  * @param {ol.TileRange} tileRange Tile range.
  * @return {boolean} The tile range is fully covered with loaded tiles.
  */
-ol.source.TileSource.prototype.findLoadedTiles = function(loadedTilesByZ,
+ol.source.Tile.prototype.findLoadedTiles = function(loadedTilesByZ,
     getTileIfLoaded, z, tileRange) {
   // FIXME this could be more efficient about filling partial holes
   var fullyCovered = true;
@@ -107,7 +107,7 @@ ol.source.TileSource.prototype.findLoadedTiles = function(loadedTilesByZ,
 /**
  * @return {boolean} Opaque.
  */
-ol.source.TileSource.prototype.getOpaque = function() {
+ol.source.Tile.prototype.getOpaque = function() {
   return this.opaque_;
 };
 
@@ -115,7 +115,7 @@ ol.source.TileSource.prototype.getOpaque = function() {
 /**
  * @inheritDoc
  */
-ol.source.TileSource.prototype.getResolutions = function() {
+ol.source.Tile.prototype.getResolutions = function() {
   return this.tileGrid.getResolutions();
 };
 
@@ -127,13 +127,13 @@ ol.source.TileSource.prototype.getResolutions = function() {
  * @param {ol.Projection=} opt_projection Projection.
  * @return {!ol.Tile} Tile.
  */
-ol.source.TileSource.prototype.getTile = goog.abstractMethod;
+ol.source.Tile.prototype.getTile = goog.abstractMethod;
 
 
 /**
  * @return {ol.tilegrid.TileGrid} Tile grid.
  */
-ol.source.TileSource.prototype.getTileGrid = function() {
+ol.source.Tile.prototype.getTileGrid = function() {
   return this.tileGrid;
 };
 
@@ -144,4 +144,4 @@ ol.source.TileSource.prototype.getTileGrid = function() {
  * @param {number} x Tile coordinate x.
  * @param {number} y Tile coordinate y.
  */
-ol.source.TileSource.prototype.useTile = goog.nullFunction;
+ol.source.Tile.prototype.useTile = goog.nullFunction;

src/ol/source/vectorsource2.exports

@@ -1 +1 @@
-@exportSymbol ol.source.VectorSource2
+@exportSymbol ol.source.Vector2

src/ol/source/vectorsource2.js

@@ -1,4 +1,4 @@
-goog.provide('ol.source.VectorSource2');
+goog.provide('ol.source.Vector2');
 
 goog.require('ol.geom2.LineStringCollection');
 goog.require('ol.geom2.PointCollection');
@@ -10,9 +10,9 @@ goog.require('ol.source.Source');
  * This is an internal class that will be removed from the API.
  * @constructor
  * @extends {ol.source.Source}
- * @param {ol.source.VectorSource2Options} options Options.
+ * @param {ol.source.Vector2Options} options Options.
  */
-ol.source.VectorSource2 = function(options) {
+ol.source.Vector2 = function(options) {
 
   goog.base(this, {
     attributions: options.attributions,
@@ -35,13 +35,13 @@ ol.source.VectorSource2 = function(options) {
       options.lineStringCollections : [];
 
 };
-goog.inherits(ol.source.VectorSource2, ol.source.Source);
+goog.inherits(ol.source.Vector2, ol.source.Source);
 
 
 /**
  * @return {Array.<ol.geom2.LineStringCollection>} Line string collections.
  */
-ol.source.VectorSource2.prototype.getLineStringCollections = function() {
+ol.source.Vector2.prototype.getLineStringCollections = function() {
   return this.lineStringCollections_;
 };
 
@@ -49,6 +49,6 @@ ol.source.VectorSource2.prototype.getLineStringCollections = function() {
 /**
  * @return {Array.<ol.geom2.PointCollection>} Point collections.
  */
-ol.source.VectorSource2.prototype.getPointCollections = function() {
+ol.source.Vector2.prototype.getPointCollections = function() {
   return this.pointCollections_;
 };

src/ol/source/wmtssource.js

@@ -11,7 +11,7 @@ goog.require('ol.TileUrlFunction');
 goog.require('ol.TileUrlFunctionType');
 goog.require('ol.extent');
 goog.require('ol.proj');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.WMTS');
 
 
@@ -27,7 +27,7 @@ ol.source.WMTSRequestEncoding = {
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @param {ol.source.WMTSOptions} options WMTS options.
  */
 ol.source.WMTS = function(options) {
@@ -170,7 +170,7 @@ ol.source.WMTS = function(options) {
   });
 
 };
-goog.inherits(ol.source.WMTS, ol.source.ImageTileSource);
+goog.inherits(ol.source.WMTS, ol.source.TileImage);
 
 
 /**

src/ol/source/xyzsource.js

@@ -6,7 +6,7 @@ goog.require('ol.Projection');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.TileUrlFunctionType');
 goog.require('ol.proj');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.XYZ');
 
 
@@ -28,7 +28,7 @@ ol.source.XYZOptions;
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @param {ol.source.XYZOptions} options XYZ options.
  */
 ol.source.XYZ = function(options) {
@@ -72,4 +72,4 @@ ol.source.XYZ = function(options) {
   });
 
 };
-goog.inherits(ol.source.XYZ, ol.source.ImageTileSource);
+goog.inherits(ol.source.XYZ, ol.source.TileImage);

src/ol/tileurlfunction.js

@@ -8,7 +8,7 @@ goog.require('ol.extent');
 
 
 /**
- * @typedef {function(this: ol.source.ImageTileSource, ol.TileCoord,
+ * @typedef {function(this: ol.source.TileImage, ol.TileCoord,
  *     ol.Projection): (string|undefined)}
  */
 ol.TileUrlFunctionType;
@@ -21,7 +21,7 @@ ol.TileUrlFunctionType;
 ol.TileUrlFunction.createFromTemplate = function(template) {
   return (
       /**
-       * @this {ol.source.ImageTileSource}
+       * @this {ol.source.TileImage}
        * @param {ol.TileCoord} tileCoord Tile Coordinate.
        * @param {ol.Projection} projection Projection.
        * @return {string|undefined} Tile URL.
@@ -58,7 +58,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
   }
   return (
       /**
-       * @this {ol.source.ImageTileSource}
+       * @this {ol.source.TileImage}
        * @param {ol.TileCoord} tileCoord Tile Coordinate.
        * @param {ol.Projection} projection Projection.
        * @return {string|undefined} Tile URL.
@@ -78,7 +78,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
 /**
  * @param {string} baseUrl Base URL (may have query data).
  * @param {Object.<string,*>} params to encode in the url.
- * @param {function(this: ol.source.ImageTileSource, string, Object.<string,*>,
+ * @param {function(this: ol.source.TileImage, string, Object.<string,*>,
  *     ol.Extent, ol.Size, ol.Projection)} paramsFunction params function.
  * @return {ol.TileUrlFunctionType} Tile URL function.
  */
@@ -87,7 +87,7 @@ ol.TileUrlFunction.createFromParamsFunction =
   var tmpExtent = ol.extent.createEmpty();
   return (
       /**
-       * @this {ol.source.ImageTileSource}
+       * @this {ol.source.TileImage}
        * @param {ol.TileCoord} tileCoord Tile Coordinate.
        * @param {ol.Projection} projection Projection.
        * @return {string|undefined} Tile URL.
@@ -110,7 +110,7 @@ ol.TileUrlFunction.createFromParamsFunction =
 
 
 /**
- * @this {ol.source.ImageTileSource}
+ * @this {ol.source.TileImage}
  * @param {ol.TileCoord} tileCoord Tile coordinate.
  * @param {ol.Projection} projection Projection.
  * @return {string|undefined} Tile URL.
@@ -131,7 +131,7 @@ ol.TileUrlFunction.withTileCoordTransform =
   var tmpTileCoord = new ol.TileCoord(0, 0, 0);
   return (
       /**
-       * @this {ol.source.ImageTileSource}
+       * @this {ol.source.TileImage}
        * @param {ol.TileCoord} tileCoord Tile Coordinate.
        * @param {ol.Projection} projection Projection.
        * @return {string|undefined} Tile URL.

test/spec/ol/layer/layergroup.test.js

@@ -1,13 +1,13 @@
 goog.provide('ol.test.layer.LayerGroup');
 
-describe('ol.layer.LayerGroup', function() {
+describe('ol.layer.Group', function() {
 
   describe('constructor (defaults)', function() {
 
     var layerGroup;
 
     beforeEach(function() {
-      layerGroup = new ol.layer.LayerGroup();
+      layerGroup = new ol.layer.Group();
     });
 
     afterEach(function() {
@@ -15,7 +15,7 @@ describe('ol.layer.LayerGroup', function() {
     });
 
     it('creates an instance', function() {
-      expect(layerGroup).to.be.a(ol.layer.LayerGroup);
+      expect(layerGroup).to.be.a(ol.layer.Group);
     });
 
     it('provides default brightness', function() {
@@ -69,7 +69,7 @@ describe('ol.layer.LayerGroup', function() {
           projection: 'EPSG:4326'
         })
       });
-      var layerGroup = new ol.layer.LayerGroup({
+      var layerGroup = new ol.layer.Group({
         layers: [layer],
         brightness: 0.5,
         contrast: 10,
@@ -109,7 +109,7 @@ describe('ol.layer.LayerGroup', function() {
     var layerGroup;
 
     beforeEach(function() {
-      layerGroup = new ol.layer.LayerGroup();
+      layerGroup = new ol.layer.Group();
     });
 
     afterEach(function() {
@@ -180,7 +180,7 @@ describe('ol.layer.LayerGroup', function() {
         })
       });
       var layers = new ol.Collection([layer]);
-      var layerGroup = new ol.layer.LayerGroup();
+      var layerGroup = new ol.layer.Group();
 
       layerGroup.setLayers(layers);
       expect(layerGroup.getLayers()).to.be(layers);
@@ -204,7 +204,7 @@ describe('ol.layer.LayerGroup', function() {
     var obj;
 
     it('returns an empty array if no layer', function() {
-      layerGroup = new ol.layer.LayerGroup();
+      layerGroup = new ol.layer.Group();
 
       obj = layerGroup.getLayerStatesArray();
       layersArray = obj.layers;
@@ -235,7 +235,7 @@ describe('ol.layer.LayerGroup', function() {
     });
 
     it('does not transform layerStates by default', function() {
-      layerGroup = new ol.layer.LayerGroup({
+      layerGroup = new ol.layer.Group({
         layers: [layer1, layer2]
       });
 
@@ -256,7 +256,7 @@ describe('ol.layer.LayerGroup', function() {
     });
 
     it('transforms layerStates correctly', function() {
-      layerGroup = new ol.layer.LayerGroup({
+      layerGroup = new ol.layer.Group({
         layers: [layer1, layer2],
         brightness: 0.5,
         contrast: 10,
@@ -292,6 +292,6 @@ describe('ol.layer.LayerGroup', function() {
 
 goog.require('goog.dispose');
 goog.require('ol.layer.Layer');
-goog.require('ol.layer.LayerGroup');
+goog.require('ol.layer.Group');
 goog.require('ol.source.Source');
 goog.require('ol.Collection');

test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js

@@ -15,8 +15,8 @@ describe('ol.renderer.webgl.ImageLayer', function() {
       map = new ol.Map({
         target: document.createElement('div')
       });
-      var layer = new ol.layer.ImageLayer({
+      var layer = new ol.layer.Image({
-        source: new ol.source.ImageSource({
+        source: new ol.source.Image({
           extent: [0, 1, 0, 1]
         })
       });
@@ -80,6 +80,6 @@ goog.require('goog.dispose');
 goog.require('goog.vec.Mat4');
 goog.require('goog.vec.Vec4');
 goog.require('ol.Map');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
-goog.require('ol.source.ImageSource');
+goog.require('ol.source.Image');
 goog.require('ol.renderer.webgl.ImageLayer');

test/spec/ol/source/tilesource.test.js

@@ -1,14 +1,14 @@
 goog.provide('ol.test.source.TileSource');
 
-describe('ol.source.TileSource', function() {
+describe('ol.source.Tile', function() {
 
   describe('constructor', function() {
     it('returns a tile source', function() {
-      var source = new ol.source.TileSource({
+      var source = new ol.source.Tile({
         projection: ol.proj.get('EPSG:4326')
       });
       expect(source).to.be.a(ol.source.Source);
-      expect(source).to.be.a(ol.source.TileSource);
+      expect(source).to.be.a(ol.source.Tile);
     });
   });
 
@@ -16,7 +16,7 @@ describe('ol.source.TileSource', function() {
 
     it('adds no tiles if none are already loaded', function() {
       // a source with no loaded tiles
-      var source = new ol.test.source.MockTileSource({});
+      var source = new ol.test.source.TileMock({});
 
       var loadedTilesByZ = {};
       var grid = source.getTileGrid();
@@ -35,7 +35,7 @@ describe('ol.source.TileSource', function() {
 
     it('adds loaded tiles to the lookup (z: 0)', function() {
       // a source with no loaded tiles
-      var source = new ol.test.source.MockTileSource({
+      var source = new ol.test.source.TileMock({
         '0/0/0': true,
         '1/0/0': true
       });
@@ -59,7 +59,7 @@ describe('ol.source.TileSource', function() {
 
     it('adds loaded tiles to the lookup (z: 1)', function() {
       // a source with no loaded tiles
-      var source = new ol.test.source.MockTileSource({
+      var source = new ol.test.source.TileMock({
         '0/0/0': true,
         '1/0/0': true
       });
@@ -83,7 +83,7 @@ describe('ol.source.TileSource', function() {
 
     it('returns true when all tiles are already loaded', function() {
       // a source with no loaded tiles
-      var source = new ol.test.source.MockTileSource({
+      var source = new ol.test.source.TileMock({
         '1/0/0': true,
         '1/0/1': true,
         '1/1/0': true,
@@ -105,7 +105,7 @@ describe('ol.source.TileSource', function() {
 
     it('returns true when all tiles are already loaded (part 2)', function() {
       // a source with no loaded tiles
-      var source = new ol.test.source.MockTileSource({});
+      var source = new ol.test.source.TileMock({});
 
       var loadedTilesByZ = {
         '1': {
@@ -131,7 +131,7 @@ describe('ol.source.TileSource', function() {
 
     it('returns false when all tiles are already loaded', function() {
       // a source with no loaded tiles
-      var source = new ol.test.source.MockTileSource({
+      var source = new ol.test.source.TileMock({
         '1/0/0': true,
         '1/0/1': true,
         '1/1/0': true,
@@ -154,7 +154,7 @@ describe('ol.source.TileSource', function() {
 
     it('returns false when all tiles are already loaded (part 2)', function() {
       // a source with no loaded tiles
-      var source = new ol.test.source.MockTileSource({});
+      var source = new ol.test.source.TileMock({});
 
       var loadedTilesByZ = {
         '1': {
@@ -188,10 +188,10 @@ describe('ol.source.TileSource', function() {
  * 256x256 tiles.
  *
  * @constructor
- * @extends {ol.source.TileSource}
+ * @extends {ol.source.Tile}
  * @param {Object.<string, boolean>} loaded Lookup of already loaded tiles.
  */
-ol.test.source.MockTileSource = function(loaded) {
+ol.test.source.TileMock = function(loaded) {
   var extent = [-180, 180, -180, 180];
   var tileGrid = new ol.tilegrid.TileGrid({
     resolutions: [360 / 256, 180 / 256, 90 / 256, 45 / 256],
@@ -213,32 +213,32 @@ ol.test.source.MockTileSource = function(loaded) {
   this.loaded_ = loaded;
 
 };
-goog.inherits(ol.test.source.MockTileSource, ol.source.TileSource);
+goog.inherits(ol.test.source.TileMock, ol.source.Tile);
 
 
 /**
  * @inheritDoc
  */
-ol.test.source.MockTileSource.prototype.getTile = function(z, x, y) {
+ol.test.source.TileMock.prototype.getTile = function(z, x, y) {
   var key = ol.TileCoord.getKeyZXY(z, x, y);
   var tileState = this.loaded_[key] ? ol.TileState.LOADED : ol.TileState.IDLE;
   return new ol.Tile(new ol.TileCoord(z, x, y), tileState);
 };
 
 
-describe('ol.test.source.MockTileSource', function() {
+describe('ol.test.source.TileMock', function() {
 
   describe('constructor', function() {
     it('creates a tile source', function() {
-      var source = new ol.test.source.MockTileSource({});
+      var source = new ol.test.source.TileMock({});
-      expect(source).to.be.a(ol.source.TileSource);
+      expect(source).to.be.a(ol.source.Tile);
-      expect(source).to.be.a(ol.test.source.MockTileSource);
+      expect(source).to.be.a(ol.test.source.TileMock);
     });
   });
 
   describe('#getTile()', function() {
     it('returns a tile with state based on constructor arg', function() {
-      var source = new ol.test.source.MockTileSource({
+      var source = new ol.test.source.TileMock({
         '0/0/0': true,
         '1/0/0': true
       });
@@ -270,5 +270,5 @@ goog.require('ol.TileCoord');
 goog.require('ol.TileState');
 goog.require('ol.proj');
 goog.require('ol.source.Source');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 goog.require('ol.tilegrid.TileGrid');