ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_source_TileImage_ to TileImage

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 13:53:35 -07:00
parent f184f6685d
commit a66128caa9
13 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/source/BingMaps.js
View File

@@ -7,7 +7,7 @@ import {applyTransform, intersects} from '../extent.js';
import _ol_net_ from '../net.js';
import {get as getProjection, getTransformFromProjections} from '../proj.js';
import SourceState from '../source/State.js';
import _ol_source_TileImage_ from '../source/TileImage.js';
import TileImage from '../source/TileImage.js';
import _ol_tilecoord_ from '../tilecoord.js';
import _ol_tilegrid_ from '../tilegrid.js';
@@ -28,7 +28,7 @@ var BingMaps = function(options) {
*/
this.hidpi_ = options.hidpi !== undefined ? options.hidpi : false;
_ol_source_TileImage_.call(this, {
TileImage.call(this, {
cacheSize: options.cacheSize,
crossOrigin: 'anonymous',
opaque: true,
@@ -75,7 +75,7 @@ var BingMaps = function(options) {
};
inherits(BingMaps, _ol_source_TileImage_);
inherits(BingMaps, TileImage);
/**

6
src/ol/source/TileArcGISRest.js
View File

@@ -6,7 +6,7 @@ import {createEmpty} from '../extent.js';
import {modulo} from '../math.js';
import _ol_obj_ from '../obj.js';
import _ol_size_ from '../size.js';
import _ol_source_TileImage_ from '../source/TileImage.js';
import TileImage from '../source/TileImage.js';
import _ol_tilecoord_ from '../tilecoord.js';
import _ol_uri_ from '../uri.js';
@@ -28,7 +28,7 @@ var _ol_source_TileArcGISRest_ = function(opt_options) {
var options = opt_options || {};
_ol_source_TileImage_.call(this, {
TileImage.call(this, {
attributions: options.attributions,
cacheSize: options.cacheSize,
crossOrigin: options.crossOrigin,
@@ -57,7 +57,7 @@ var _ol_source_TileArcGISRest_ = function(opt_options) {
this.setKey(this.getKeyForParams_());
};
inherits(_ol_source_TileArcGISRest_, _ol_source_TileImage_);
inherits(_ol_source_TileArcGISRest_, TileImage);
/**

34
src/ol/source/TileImage.js
View File

@@ -24,7 +24,7 @@ import _ol_tilegrid_ from '../tilegrid.js';
* @param {olx.source.TileImageOptions} options Image tile options.
* @api
*/
var _ol_source_TileImage_ = function(options) {
var TileImage = function(options) {
_ol_source_UrlTile_.call(this, {
attributions: options.attributions,
@@ -35,7 +35,7 @@ var _ol_source_TileImage_ = function(options) {
state: options.state,
tileGrid: options.tileGrid,
tileLoadFunction: options.tileLoadFunction ?
options.tileLoadFunction : _ol_source_TileImage_.defaultTileLoadFunction,
options.tileLoadFunction : TileImage.defaultTileLoadFunction,
tilePixelRatio: options.tilePixelRatio,
tileUrlFunction: options.tileUrlFunction,
url: options.url,
@@ -84,13 +84,13 @@ var _ol_source_TileImage_ = function(options) {
this.renderReprojectionEdges_ = false;
};
inherits(_ol_source_TileImage_, _ol_source_UrlTile_);
inherits(TileImage, _ol_source_UrlTile_);
/**
* @inheritDoc
*/
_ol_source_TileImage_.prototype.canExpireCache = function() {
TileImage.prototype.canExpireCache = function() {
if (!ENABLE_RASTER_REPROJECTION) {
return _ol_source_UrlTile_.prototype.canExpireCache.call(this);
}
@@ -110,7 +110,7 @@ _ol_source_TileImage_.prototype.canExpireCache = function() {
/**
* @inheritDoc
*/
_ol_source_TileImage_.prototype.expireCache = function(projection, usedTiles) {
TileImage.prototype.expireCache = function(projection, usedTiles) {
if (!ENABLE_RASTER_REPROJECTION) {
_ol_source_UrlTile_.prototype.expireCache.call(this, projection, usedTiles);
return;
@@ -128,7 +128,7 @@ _ol_source_TileImage_.prototype.expireCache = function(projection, usedTiles) {
/**
* @inheritDoc
*/
_ol_source_TileImage_.prototype.getGutter = function(projection) {
TileImage.prototype.getGutter = function(projection) {
if (ENABLE_RASTER_REPROJECTION &&
this.getProjection() && projection && !equivalent(this.getProjection(), projection)) {
return 0;
@@ -142,7 +142,7 @@ _ol_source_TileImage_.prototype.getGutter = function(projection) {
* @protected
* @return {number} Gutter.
*/
_ol_source_TileImage_.prototype.getGutterInternal = function() {
TileImage.prototype.getGutterInternal = function() {
return 0;
};
@@ -150,7 +150,7 @@ _ol_source_TileImage_.prototype.getGutterInternal = function() {
/**
* @inheritDoc
*/
_ol_source_TileImage_.prototype.getOpaque = function(projection) {
TileImage.prototype.getOpaque = function(projection) {
if (ENABLE_RASTER_REPROJECTION &&
this.getProjection() && projection && !equivalent(this.getProjection(), projection)) {
return false;
@@ -163,7 +163,7 @@ _ol_source_TileImage_.prototype.getOpaque = function(projection) {
/**
* @inheritDoc
*/
_ol_source_TileImage_.prototype.getTileGridForProjection = function(projection) {
TileImage.prototype.getTileGridForProjection = function(projection) {
if (!ENABLE_RASTER_REPROJECTION) {
return _ol_source_UrlTile_.prototype.getTileGridForProjection.call(this, projection);
}
@@ -184,7 +184,7 @@ _ol_source_TileImage_.prototype.getTileGridForProjection = function(projection)
/**
* @inheritDoc
*/
_ol_source_TileImage_.prototype.getTileCacheForProjection = function(projection) {
TileImage.prototype.getTileCacheForProjection = function(projection) {
if (!ENABLE_RASTER_REPROJECTION) {
return _ol_source_UrlTile_.prototype.getTileCacheForProjection.call(this, projection);
}
@@ -210,7 +210,7 @@ _ol_source_TileImage_.prototype.getTileCacheForProjection = function(projection)
* @return {!ol.Tile} Tile.
* @private
*/
_ol_source_TileImage_.prototype.createTile_ = function(z, x, y, pixelRatio, projection, key) {
TileImage.prototype.createTile_ = function(z, x, y, pixelRatio, projection, key) {
var tileCoord = [z, x, y];
var urlTileCoord = this.getTileCoordForTileUrlFunction(
tileCoord, projection);
@@ -233,7 +233,7 @@ _ol_source_TileImage_.prototype.createTile_ = function(z, x, y, pixelRatio, proj
/**
* @inheritDoc
*/
_ol_source_TileImage_.prototype.getTile = function(z, x, y, pixelRatio, projection) {
TileImage.prototype.getTile = function(z, x, y, pixelRatio, projection) {
var sourceProjection = /** @type {!ol.proj.Projection} */ (this.getProjection());
if (!ENABLE_RASTER_REPROJECTION ||
!sourceProjection || !projection || equivalent(sourceProjection, projection)) {
@@ -287,7 +287,7 @@ _ol_source_TileImage_.prototype.getTile = function(z, x, y, pixelRatio, projecti
* @return {!ol.Tile} Tile.
* @protected
*/
_ol_source_TileImage_.prototype.getTileInternal = function(z, x, y, pixelRatio, projection) {
TileImage.prototype.getTileInternal = function(z, x, y, pixelRatio, projection) {
var tile = null;
var tileCoordKey = _ol_tilecoord_.getKeyZXY(z, x, y);
var key = this.getKey();
@@ -323,7 +323,7 @@ _ol_source_TileImage_.prototype.getTileInternal = function(z, x, y, pixelRatio,
* @param {boolean} render Render the edges.
* @api
*/
_ol_source_TileImage_.prototype.setRenderReprojectionEdges = function(render) {
TileImage.prototype.setRenderReprojectionEdges = function(render) {
if (!ENABLE_RASTER_REPROJECTION ||
this.renderReprojectionEdges_ == render) {
return;
@@ -348,7 +348,7 @@ _ol_source_TileImage_.prototype.setRenderReprojectionEdges = function(render) {
* @param {ol.tilegrid.TileGrid} tilegrid Tile grid to use for the projection.
* @api
*/
_ol_source_TileImage_.prototype.setTileGridForProjection = function(projection, tilegrid) {
TileImage.prototype.setTileGridForProjection = function(projection, tilegrid) {
if (ENABLE_RASTER_REPROJECTION) {
var proj = getProjection(projection);
if (proj) {
@@ -365,7 +365,7 @@ _ol_source_TileImage_.prototype.setTileGridForProjection = function(projection,
* @param {ol.ImageTile} imageTile Image tile.
* @param {string} src Source.
*/
_ol_source_TileImage_.defaultTileLoadFunction = function(imageTile, src) {
TileImage.defaultTileLoadFunction = function(imageTile, src) {
imageTile.getImage().src = src;
};
export default _ol_source_TileImage_;
export default TileImage;

6
src/ol/source/TileJSON.js
View File

@@ -14,7 +14,7 @@ import {applyTransform, intersects} from '../extent.js';
import _ol_net_ from '../net.js';
import {get as getProjection, getTransformFromProjections} from '../proj.js';
import SourceState from '../source/State.js';
import _ol_source_TileImage_ from '../source/TileImage.js';
import TileImage from '../source/TileImage.js';
import _ol_tilegrid_ from '../tilegrid.js';
/**
@@ -34,7 +34,7 @@ var _ol_source_TileJSON_ = function(options) {
*/
this.tileJSON_ = null;
_ol_source_TileImage_.call(this, {
TileImage.call(this, {
attributions: options.attributions,
cacheSize: options.cacheSize,
crossOrigin: options.crossOrigin,
@@ -65,7 +65,7 @@ var _ol_source_TileJSON_ = function(options) {
};
inherits(_ol_source_TileJSON_, _ol_source_TileImage_);
inherits(_ol_source_TileJSON_, TileImage);
/**

6
src/ol/source/TileWMS.js
View File

@@ -11,7 +11,7 @@ import {modulo} from '../math.js';
import {get as getProjection, transform, transformExtent} from '../proj.js';
import _ol_reproj_ from '../reproj.js';
import _ol_size_ from '../size.js';
import _ol_source_TileImage_ from '../source/TileImage.js';
import TileImage from '../source/TileImage.js';
import WMSServerType from '../source/WMSServerType.js';
import _ol_tilecoord_ from '../tilecoord.js';
import _ol_string_ from '../string.js';
@@ -34,7 +34,7 @@ var _ol_source_TileWMS_ = function(opt_options) {
var transparent = 'TRANSPARENT' in params ? params['TRANSPARENT'] : true;
_ol_source_TileImage_.call(this, {
TileImage.call(this, {
attributions: options.attributions,
cacheSize: options.cacheSize,
crossOrigin: options.crossOrigin,
@@ -91,7 +91,7 @@ var _ol_source_TileWMS_ = function(opt_options) {
};
inherits(_ol_source_TileWMS_, _ol_source_TileImage_);
inherits(_ol_source_TileWMS_, TileImage);
/**

6
src/ol/source/WMTS.js
View File

@@ -7,7 +7,7 @@ import {find, findIndex, includes} from '../array.js';
import {containsExtent} from '../extent.js';
import _ol_obj_ from '../obj.js';
import {get as getProjection, equivalent, transformExtent} from '../proj.js';
import _ol_source_TileImage_ from '../source/TileImage.js';
import TileImage from '../source/TileImage.js';
import WMTSRequestEncoding from '../source/WMTSRequestEncoding.js';
import {createFromCapabilitiesMatrixSet} from '../tilegrid/WMTS.js';
import _ol_uri_ from '../uri.js';
@@ -153,7 +153,7 @@ var _ol_source_WMTS_ = function(options) {
var tileUrlFunction = (urls && urls.length > 0) ?
createFromTileUrlFunctions(urls.map(this.createFromWMTSTemplate_)) : nullTileUrlFunction;
_ol_source_TileImage_.call(this, {
TileImage.call(this, {
attributions: options.attributions,
cacheSize: options.cacheSize,
crossOrigin: options.crossOrigin,
@@ -173,7 +173,7 @@ var _ol_source_WMTS_ = function(options) {
};
inherits(_ol_source_WMTS_, _ol_source_TileImage_);
inherits(_ol_source_WMTS_, TileImage);
/**
* Set the URLs to use for requests.

6
src/ol/source/XYZ.js
View File

@@ -2,7 +2,7 @@
* @module ol/source/XYZ
*/
import {inherits} from '../index.js';
import _ol_source_TileImage_ from '../source/TileImage.js';
import TileImage from '../source/TileImage.js';
import _ol_tilegrid_ from '../tilegrid.js';
/**
@@ -40,7 +40,7 @@ var _ol_source_XYZ_ = function(opt_options) {
tileSize: options.tileSize
});
_ol_source_TileImage_.call(this, {
TileImage.call(this, {
attributions: options.attributions,
cacheSize: options.cacheSize,
crossOrigin: options.crossOrigin,
@@ -59,5 +59,5 @@ var _ol_source_XYZ_ = function(opt_options) {
};
inherits(_ol_source_XYZ_, _ol_source_TileImage_);
inherits(_ol_source_XYZ_, TileImage);
export default _ol_source_XYZ_;

6
src/ol/source/Zoomify.js
View File

@@ -10,7 +10,7 @@ import {assert} from '../asserts.js';
import {createCanvasContext2D} from '../dom.js';
import {getTopLeft} from '../extent.js';
import _ol_size_ from '../size.js';
import _ol_source_TileImage_ from '../source/TileImage.js';
import TileImage from '../source/TileImage.js';
import TileGrid from '../tilegrid/TileGrid.js';
/**
@@ -137,7 +137,7 @@ var _ol_source_Zoomify_ = function(opt_options) {
var ZoomifyTileClass = _ol_source_Zoomify_.Tile_.bind(null, tileGrid);
_ol_source_TileImage_.call(this, {
TileImage.call(this, {
attributions: options.attributions,
cacheSize: options.cacheSize,
crossOrigin: options.crossOrigin,
@@ -151,7 +151,7 @@ var _ol_source_Zoomify_ = function(opt_options) {
};
inherits(_ol_source_Zoomify_, _ol_source_TileImage_);
inherits(_ol_source_Zoomify_, TileImage);
/**
* @constructor