Rename ol.layer.TileLayer to ol.layer.Tile

This commit is contained in:
Tom Payne
2013-09-09 15:14:45 +02:00
parent 8f6f5e42c6
commit 8f8f94e697
60 changed files with 145 additions and 145 deletions

View File

@@ -344,7 +344,7 @@
*/
/**
* @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.

View File

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

View File

@@ -1,4 +1,4 @@
goog.provide('ol.layer.TileLayer');
goog.provide('ol.layer.Tile');
goog.require('ol.layer.Layer');
goog.require('ol.source.Tile');
@@ -7,7 +7,7 @@ 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,25 +26,25 @@ 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() {
return /** @type {number} */ (this.get(ol.layer.TileLayerProperty.PRELOAD));
ol.layer.Tile.prototype.getPreload = function() {
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.Tile} Source.
*/
ol.layer.TileLayer.prototype.getTileSource = function() {
ol.layer.Tile.prototype.getTileSource = function() {
return /** @type {ol.source.Tile} */ (this.getSource());
};
@@ -52,10 +52,10 @@ ol.layer.TileLayer.prototype.getTileSource = function() {
/**
* @param {number} preload Preload.
*/
ol.layer.TileLayer.prototype.setPreload = function(preload) {
this.set(ol.layer.TileLayerProperty.PRELOAD, preload);
ol.layer.Tile.prototype.setPreload = function(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);

View File

@@ -129,7 +129,7 @@ ol.MapProperty = {
* zoom: 1
* }),
* layers: [
* new ol.layer.TileLayer({
* new ol.layer.Tile({
* source: new ol.source.MapQuestOSM()
* })
* ],

View File

@@ -10,7 +10,7 @@ goog.require('goog.vec.Mat4');
goog.require('ol.Size');
goog.require('ol.css');
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');
@@ -68,7 +68,7 @@ goog.inherits(ol.renderer.canvas.Map, ol.renderer.Map);
ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) {
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);

View File

@@ -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());
};

View File

@@ -6,7 +6,7 @@ goog.require('goog.dom.TagName');
goog.require('goog.style');
goog.require('ol.css');
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,7 +51,7 @@ 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.Image) {
layerRenderer = new ol.renderer.dom.ImageLayer(this, layer);

View File

@@ -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());
};

View File

@@ -18,7 +18,7 @@ goog.require('ol.Size');
goog.require('ol.Tile');
goog.require('ol.css');
goog.require('ol.layer.Image');
goog.require('ol.layer.TileLayer');
goog.require('ol.layer.Tile');
goog.require('ol.layer.VectorLayer2');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.webgl.ImageLayer');
@@ -299,7 +299,7 @@ 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.Image) {
return new ol.renderer.webgl.ImageLayer(this, layer);

View File

@@ -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());
};