s/ol.TileLayer/ol.layer.TileLayer/

src/ol/layer/bingmaps.js

@@ -6,8 +6,8 @@ goog.require('goog.events');
 goog.require('goog.events.EventType');
 goog.require('goog.net.Jsonp');
 goog.require('ol.TileCoverageArea');
-goog.require('ol.TileLayer');
 goog.require('ol.TileSource');
+goog.require('ol.layer.TileLayer');
 goog.require('ol.tilegrid.XYZ');
 
 
@@ -26,7 +26,7 @@ ol.BingMapsStyle = {
 
 /**
  * @constructor
- * @extends {ol.TileLayer}
+ * @extends {ol.layer.TileLayer}
  * @param {ol.BingMapsStyle} style Bing Maps style.
  * @param {string} key Key.
  * @param {string=} opt_culture Culture.
@@ -39,7 +39,7 @@ ol.layer.BingMaps = function(style, key, opt_culture, opt_values) {
       }, this);
   goog.base(this, tileSource, opt_values);
 };
-goog.inherits(ol.layer.BingMaps, ol.TileLayer);
+goog.inherits(ol.layer.BingMaps, ol.layer.TileLayer);
 
 
 

src/ol/layer/openstreetmap.js

@@ -1,22 +1,22 @@
 goog.provide('ol.layer.OpenStreetMap');
 goog.provide('ol.source.OpenStreetMap');
 
-goog.require('ol.TileLayer');
 goog.require('ol.TileUrlFunction');
+goog.require('ol.layer.TileLayer');
 goog.require('ol.tilesource.XYZ');
 
 
 
 /**
  * @constructor
- * @extends {ol.TileLayer}
+ * @extends {ol.layer.TileLayer}
  * @param {Object.<string, *>=} opt_values Values.
  */
 ol.layer.OpenStreetMap = function(opt_values) {
   var tileSource = new ol.source.OpenStreetMap();
   goog.base(this, tileSource, opt_values);
 };
-goog.inherits(ol.layer.OpenStreetMap, ol.TileLayer);
+goog.inherits(ol.layer.OpenStreetMap, ol.layer.TileLayer);
 
 
 

src/ol/layer/tilejson.js

@@ -15,9 +15,9 @@ goog.require('goog.events.EventType');
 goog.require('goog.net.jsloader');
 goog.require('goog.string');
 goog.require('ol.TileCoverageArea');
-goog.require('ol.TileLayer');
 goog.require('ol.TileSource');
 goog.require('ol.TileUrlFunction');
+goog.require('ol.layer.TileLayer');
 
 
 /**
@@ -39,7 +39,7 @@ goog.exportSymbol('grid', grid);
 
 /**
  * @constructor
- * @extends {ol.TileLayer}
+ * @extends {ol.layer.TileLayer}
  * @param {string} url URL.
  * @param {Object.<string, *>=} opt_values Values.
  */
@@ -50,7 +50,7 @@ ol.layer.TileJSON = function(url, opt_values) {
   }, this);
   goog.base(this, tileSource, opt_values);
 };
-goog.inherits(ol.layer.TileJSON, ol.TileLayer);
+goog.inherits(ol.layer.TileJSON, ol.layer.TileLayer);
 
 
 

src/ol/layer/tilelayer.js

@@ -1,4 +1,4 @@
-goog.provide('ol.TileLayer');
+goog.provide('ol.layer.TileLayer');
 
 goog.require('ol.TileSource');
 goog.require('ol.layer.Layer');
@@ -11,16 +11,16 @@ goog.require('ol.layer.Layer');
  * @param {ol.TileSource} tileSource Tile source.
  * @param {Object.<string, *>=} opt_values Values.
  */
-ol.TileLayer = function(tileSource, opt_values) {
+ol.layer.TileLayer = function(tileSource, opt_values) {
   goog.base(this, tileSource, opt_values);
 };
-goog.inherits(ol.TileLayer, ol.layer.Layer);
+goog.inherits(ol.layer.TileLayer, ol.layer.Layer);
 
 
 /**
  * @inheritDoc
  * @return {ol.TileSource} Source.
  */
-ol.TileLayer.prototype.getSource = function() {
+ol.layer.TileLayer.prototype.getSource = function() {
   return /** @type {ol.TileSource} */ goog.base(this, 'getSource');
 };

src/ol/layer/xyz.js

@@ -9,10 +9,10 @@ goog.require('ol.Projection');
 goog.require('ol.Size');
 goog.require('ol.TileCoord');
 goog.require('ol.TileGrid');
-goog.require('ol.TileLayer');
 goog.require('ol.TileSource');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.layer.Layer');
+goog.require('ol.layer.TileLayer');
 
 
 
@@ -67,7 +67,7 @@ ol.tilegrid.XYZ.prototype.forEachTileCoordParentTileRange =
 
 /**
  * @constructor
- * @extends {ol.TileLayer}
+ * @extends {ol.layer.TileLayer}
  * @param {number} maxZoom Maximum zoom.
  * @param {ol.TileUrlFunctionType} tileUrlFunction Tile URL function.
  * @param {Array.<ol.Attribution>=} opt_attributions Attributions.
@@ -80,7 +80,7 @@ ol.layer.XYZ = function(
       maxZoom, tileUrlFunction, opt_attributions, opt_crossOrigin);
   goog.base(this, tileSource, opt_values);
 };
-goog.inherits(ol.layer.XYZ, ol.TileLayer);
+goog.inherits(ol.layer.XYZ, ol.layer.TileLayer);
 
 
 

src/ol/renderer/dom/map.js

@@ -8,7 +8,7 @@ goog.require('goog.events.Event');
 goog.require('goog.style');
 goog.require('ol.Coordinate');
 goog.require('ol.Map');
-goog.require('ol.TileLayer');
+goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.dom.TileLayer');
 
@@ -61,7 +61,7 @@ goog.inherits(ol.renderer.dom.Map, ol.renderer.Map);
  */
 ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) {
 
-  if (layer instanceof ol.TileLayer) {
+  if (layer instanceof ol.layer.TileLayer) {
 
     var layerPane = goog.dom.createElement(goog.dom.TagName.DIV);
     layerPane.className = 'ol-layer';

src/ol/renderer/dom/tilelayer.js

@@ -15,7 +15,7 @@ goog.require('ol.renderer.dom.Layer');
  * @constructor
  * @extends {ol.renderer.dom.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.TileLayer} tileLayer Tile layer.
+ * @param {ol.layer.TileLayer} tileLayer Tile layer.
  * @param {!Element} target Target.
  */
 ol.renderer.dom.TileLayer = function(mapRenderer, tileLayer, target) {
@@ -58,10 +58,10 @@ goog.inherits(ol.renderer.dom.TileLayer, ol.renderer.dom.Layer);
 
 /**
  * @inheritDoc
- * @return {ol.TileLayer} Layer.
+ * @return {ol.layer.TileLayer} Layer.
  */
 ol.renderer.dom.TileLayer.prototype.getLayer = function() {
-  return /** @type {ol.TileLayer} */ goog.base(this, 'getLayer');
+  return /** @type {ol.layer.TileLayer} */ goog.base(this, 'getLayer');
 };
 
 

src/ol/renderer/webgl/map.js

@@ -18,8 +18,8 @@ goog.require('goog.functions');
 goog.require('goog.style');
 goog.require('goog.webgl');
 goog.require('ol.Map');
-goog.require('ol.TileLayer');
 goog.require('ol.layer.Layer');
+goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.webgl.FragmentShader');
 goog.require('ol.renderer.webgl.TileLayer');
 goog.require('ol.renderer.webgl.VertexShader');
@@ -305,7 +305,7 @@ ol.renderer.webgl.Map.prototype.canRotate = goog.functions.TRUE;
  */
 ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
   var gl = this.getGL();
-  if (layer instanceof ol.TileLayer) {
+  if (layer instanceof ol.layer.TileLayer) {
     return new ol.renderer.webgl.TileLayer(this, layer);
   } else {
     goog.asserts.assert(false);

src/ol/renderer/webgl/tilelayer.js

@@ -17,8 +17,8 @@ goog.require('goog.webgl');
 goog.require('ol.Coordinate');
 goog.require('ol.MapEventType');
 goog.require('ol.Size');
-goog.require('ol.TileLayer');
 goog.require('ol.TileState');
+goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.webgl.FragmentShader');
 goog.require('ol.renderer.webgl.Layer');
 goog.require('ol.renderer.webgl.VertexShader');
@@ -81,7 +81,7 @@ goog.addSingletonGetter(ol.renderer.webgl.tilelayerrenderer.shader.Vertex);
  * @constructor
  * @extends {ol.renderer.webgl.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.TileLayer} tileLayer Tile layer.
+ * @param {ol.layer.TileLayer} tileLayer Tile layer.
  */
 ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
 
@@ -253,11 +253,11 @@ ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
 
 
 /**
- * @return {ol.TileLayer} Layer.
+ * @return {ol.layer.TileLayer} Layer.
  * @inheritDoc
  */
 ol.renderer.webgl.TileLayer.prototype.getLayer = function() {
-  return /** @type {ol.TileLayer} */ goog.base(this, 'getLayer');
+  return /** @type {ol.layer.TileLayer} */ goog.base(this, 'getLayer');
 };