Rename ol.source.ImageTileSource to ol.source.TileImage

This commit is contained in:
Tom Payne
2013-09-09 15:09:25 +02:00
parent bf1d804a5e
commit 0235caa1e0
7 changed files with 29 additions and 29 deletions
+3 -3
View File
@@ -9,14 +9,14 @@ goog.require('ol.TileRange');
goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunction');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.proj'); goog.require('ol.proj');
goog.require('ol.source.ImageTileSource'); goog.require('ol.source.TileImage');
goog.require('ol.tilegrid.XYZ'); goog.require('ol.tilegrid.XYZ');
/** /**
* @constructor * @constructor
* @extends {ol.source.ImageTileSource} * @extends {ol.source.TileImage}
* @param {ol.source.BingMapsOptions} options Bing Maps options. * @param {ol.source.BingMapsOptions} options Bing Maps options.
*/ */
ol.source.BingMaps = function(options) { ol.source.BingMaps = function(options) {
@@ -48,7 +48,7 @@ ol.source.BingMaps = function(options) {
}, goog.bind(this.handleImageryMetadataResponse, this)); }, goog.bind(this.handleImageryMetadataResponse, this));
}; };
goog.inherits(ol.source.BingMaps, ol.source.ImageTileSource); goog.inherits(ol.source.BingMaps, ol.source.TileImage);
/** /**
+7 -7
View File
@@ -1,4 +1,4 @@
goog.provide('ol.source.ImageTileSource'); goog.provide('ol.source.TileImage');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('ol.Attribution'); goog.require('ol.Attribution');
@@ -34,7 +34,7 @@ ol.source.ImageTileOptions;
* @extends {ol.source.Tile} * @extends {ol.source.Tile}
* @param {ol.source.ImageTileOptions} options Image tile options. * @param {ol.source.ImageTileOptions} options Image tile options.
*/ */
ol.source.ImageTileSource = function(options) { ol.source.TileImage = function(options) {
goog.base(this, { goog.base(this, {
attributions: options.attributions, attributions: options.attributions,
@@ -67,13 +67,13 @@ ol.source.ImageTileSource = function(options) {
this.tileCache_ = new ol.TileCache(); this.tileCache_ = new ol.TileCache();
}; };
goog.inherits(ol.source.ImageTileSource, ol.source.Tile); goog.inherits(ol.source.TileImage, ol.source.Tile);
/** /**
* @inheritDoc * @inheritDoc
*/ */
ol.source.ImageTileSource.prototype.canExpireCache = function() { ol.source.TileImage.prototype.canExpireCache = function() {
return this.tileCache_.canExpireCache(); return this.tileCache_.canExpireCache();
}; };
@@ -81,7 +81,7 @@ ol.source.ImageTileSource.prototype.canExpireCache = function() {
/** /**
* @inheritDoc * @inheritDoc
*/ */
ol.source.ImageTileSource.prototype.expireCache = function(usedTiles) { ol.source.TileImage.prototype.expireCache = function(usedTiles) {
this.tileCache_.expireCache(usedTiles); this.tileCache_.expireCache(usedTiles);
}; };
@@ -89,7 +89,7 @@ ol.source.ImageTileSource.prototype.expireCache = function(usedTiles) {
/** /**
* @inheritDoc * @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); var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y);
if (this.tileCache_.containsKey(tileCoordKey)) { if (this.tileCache_.containsKey(tileCoordKey)) {
return /** @type {!ol.Tile} */ (this.tileCache_.get(tileCoordKey)); return /** @type {!ol.Tile} */ (this.tileCache_.get(tileCoordKey));
@@ -111,7 +111,7 @@ ol.source.ImageTileSource.prototype.getTile = function(z, x, y, projection) {
/** /**
* @inheritDoc * @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); var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y);
if (this.tileCache_.containsKey(tileCoordKey)) { if (this.tileCache_.containsKey(tileCoordKey)) {
this.tileCache_.get(tileCoordKey); this.tileCache_.get(tileCoordKey);
+3 -3
View File
@@ -9,14 +9,14 @@ goog.require('ol.TileCoord');
goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunction');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.source.FeatureInfoSource'); goog.require('ol.source.FeatureInfoSource');
goog.require('ol.source.ImageTileSource'); goog.require('ol.source.TileImage');
goog.require('ol.source.wms'); goog.require('ol.source.wms');
/** /**
* @constructor * @constructor
* @extends {ol.source.ImageTileSource} * @extends {ol.source.TileImage}
* @implements {ol.source.FeatureInfoSource} * @implements {ol.source.FeatureInfoSource}
* @param {ol.source.TiledWMSOptions} options Tiled WMS options. * @param {ol.source.TiledWMSOptions} options Tiled WMS options.
*/ */
@@ -94,7 +94,7 @@ ol.source.TiledWMS = function(options) {
options.getFeatureInfoOptions : {}; options.getFeatureInfoOptions : {};
}; };
goog.inherits(ol.source.TiledWMS, ol.source.ImageTileSource); goog.inherits(ol.source.TiledWMS, ol.source.TileImage);
/** /**
+3 -3
View File
@@ -15,7 +15,7 @@ goog.require('ol.TileRange');
goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunction');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.proj'); goog.require('ol.proj');
goog.require('ol.source.ImageTileSource'); goog.require('ol.source.TileImage');
goog.require('ol.tilegrid.XYZ'); goog.require('ol.tilegrid.XYZ');
@@ -38,7 +38,7 @@ goog.exportSymbol('grid', grid);
/** /**
* @constructor * @constructor
* @extends {ol.source.ImageTileSource} * @extends {ol.source.TileImage}
* @param {ol.source.TileJSONOptions} options TileJSON options. * @param {ol.source.TileJSONOptions} options TileJSON options.
*/ */
ol.source.TileJSON = function(options) { ol.source.TileJSON = function(options) {
@@ -62,7 +62,7 @@ ol.source.TileJSON = function(options) {
this.deferred_.addCallback(this.handleTileJSONResponse, this); this.deferred_.addCallback(this.handleTileJSONResponse, this);
}; };
goog.inherits(ol.source.TileJSON, ol.source.ImageTileSource); goog.inherits(ol.source.TileJSON, ol.source.TileImage);
/** /**
+3 -3
View File
@@ -11,7 +11,7 @@ goog.require('ol.TileUrlFunction');
goog.require('ol.TileUrlFunctionType'); goog.require('ol.TileUrlFunctionType');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.proj'); goog.require('ol.proj');
goog.require('ol.source.ImageTileSource'); goog.require('ol.source.TileImage');
goog.require('ol.tilegrid.WMTS'); goog.require('ol.tilegrid.WMTS');
@@ -27,7 +27,7 @@ ol.source.WMTSRequestEncoding = {
/** /**
* @constructor * @constructor
* @extends {ol.source.ImageTileSource} * @extends {ol.source.TileImage}
* @param {ol.source.WMTSOptions} options WMTS options. * @param {ol.source.WMTSOptions} options WMTS options.
*/ */
ol.source.WMTS = function(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);
/** /**
+3 -3
View File
@@ -6,7 +6,7 @@ goog.require('ol.Projection');
goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunction');
goog.require('ol.TileUrlFunctionType'); goog.require('ol.TileUrlFunctionType');
goog.require('ol.proj'); goog.require('ol.proj');
goog.require('ol.source.ImageTileSource'); goog.require('ol.source.TileImage');
goog.require('ol.tilegrid.XYZ'); goog.require('ol.tilegrid.XYZ');
@@ -28,7 +28,7 @@ ol.source.XYZOptions;
/** /**
* @constructor * @constructor
* @extends {ol.source.ImageTileSource} * @extends {ol.source.TileImage}
* @param {ol.source.XYZOptions} options XYZ options. * @param {ol.source.XYZOptions} options XYZ options.
*/ */
ol.source.XYZ = function(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);
+7 -7
View File
@@ -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.Projection): (string|undefined)}
*/ */
ol.TileUrlFunctionType; ol.TileUrlFunctionType;
@@ -21,7 +21,7 @@ ol.TileUrlFunctionType;
ol.TileUrlFunction.createFromTemplate = function(template) { ol.TileUrlFunction.createFromTemplate = function(template) {
return ( return (
/** /**
* @this {ol.source.ImageTileSource} * @this {ol.source.TileImage}
* @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.TileCoord} tileCoord Tile Coordinate.
* @param {ol.Projection} projection Projection. * @param {ol.Projection} projection Projection.
* @return {string|undefined} Tile URL. * @return {string|undefined} Tile URL.
@@ -58,7 +58,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
} }
return ( return (
/** /**
* @this {ol.source.ImageTileSource} * @this {ol.source.TileImage}
* @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.TileCoord} tileCoord Tile Coordinate.
* @param {ol.Projection} projection Projection. * @param {ol.Projection} projection Projection.
* @return {string|undefined} Tile URL. * @return {string|undefined} Tile URL.
@@ -78,7 +78,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
/** /**
* @param {string} baseUrl Base URL (may have query data). * @param {string} baseUrl Base URL (may have query data).
* @param {Object.<string,*>} params to encode in the url. * @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. * ol.Extent, ol.Size, ol.Projection)} paramsFunction params function.
* @return {ol.TileUrlFunctionType} Tile URL function. * @return {ol.TileUrlFunctionType} Tile URL function.
*/ */
@@ -87,7 +87,7 @@ ol.TileUrlFunction.createFromParamsFunction =
var tmpExtent = ol.extent.createEmpty(); var tmpExtent = ol.extent.createEmpty();
return ( return (
/** /**
* @this {ol.source.ImageTileSource} * @this {ol.source.TileImage}
* @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.TileCoord} tileCoord Tile Coordinate.
* @param {ol.Projection} projection Projection. * @param {ol.Projection} projection Projection.
* @return {string|undefined} Tile URL. * @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.TileCoord} tileCoord Tile coordinate.
* @param {ol.Projection} projection Projection. * @param {ol.Projection} projection Projection.
* @return {string|undefined} Tile URL. * @return {string|undefined} Tile URL.
@@ -131,7 +131,7 @@ ol.TileUrlFunction.withTileCoordTransform =
var tmpTileCoord = new ol.TileCoord(0, 0, 0); var tmpTileCoord = new ol.TileCoord(0, 0, 0);
return ( return (
/** /**
* @this {ol.source.ImageTileSource} * @this {ol.source.TileImage}
* @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.TileCoord} tileCoord Tile Coordinate.
* @param {ol.Projection} projection Projection. * @param {ol.Projection} projection Projection.
* @return {string|undefined} Tile URL. * @return {string|undefined} Tile URL.