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

Rename _ol_ImageTile_ to ImageTile

Browse Source
This commit is contained in:
Frederic Junod
2017-12-22 09:18:12 +01:00
parent 53c4113684
commit fd84f9378e
10 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ol/ImageTile.js
View File

@@ -18,7 +18,7 @@ import EventType from './events/EventType.js';
* @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
* @param {olx.TileOptions=} opt_options Tile options.
*/
var _ol_ImageTile_ = function(tileCoord, state, src, crossOrigin, tileLoadFunction, opt_options) {
var ImageTile = function(tileCoord, state, src, crossOrigin, tileLoadFunction, opt_options) {
_ol_Tile_.call(this, tileCoord, state, opt_options);
@@ -59,16 +59,16 @@ var _ol_ImageTile_ = function(tileCoord, state, src, crossOrigin, tileLoadFuncti
};
inherits(_ol_ImageTile_, _ol_Tile_);
inherits(ImageTile, _ol_Tile_);
/**
* @inheritDoc
*/
_ol_ImageTile_.prototype.disposeInternal = function() {
ImageTile.prototype.disposeInternal = function() {
if (this.state == TileState.LOADING) {
this.unlistenImage_();
this.image_ = _ol_ImageTile_.getBlankImage();
this.image_ = ImageTile.getBlankImage();
}
if (this.interimTile) {
this.interimTile.dispose();
@@ -84,7 +84,7 @@ _ol_ImageTile_.prototype.disposeInternal = function() {
* @return {HTMLCanvasElement|HTMLImageElement|HTMLVideoElement} Image.
* @api
*/
_ol_ImageTile_.prototype.getImage = function() {
ImageTile.prototype.getImage = function() {
return this.image_;
};
@@ -92,7 +92,7 @@ _ol_ImageTile_.prototype.getImage = function() {
/**
* @inheritDoc
*/
_ol_ImageTile_.prototype.getKey = function() {
ImageTile.prototype.getKey = function() {
return this.src_;
};
@@ -102,10 +102,10 @@ _ol_ImageTile_.prototype.getKey = function() {
*
* @private
*/
_ol_ImageTile_.prototype.handleImageError_ = function() {
ImageTile.prototype.handleImageError_ = function() {
this.state = TileState.ERROR;
this.unlistenImage_();
this.image_ = _ol_ImageTile_.getBlankImage();
this.image_ = ImageTile.getBlankImage();
this.changed();
};
@@ -115,7 +115,7 @@ _ol_ImageTile_.prototype.handleImageError_ = function() {
*
* @private
*/
_ol_ImageTile_.prototype.handleImageLoad_ = function() {
ImageTile.prototype.handleImageLoad_ = function() {
if (this.image_.naturalWidth && this.image_.naturalHeight) {
this.state = TileState.LOADED;
} else {
@@ -130,7 +130,7 @@ _ol_ImageTile_.prototype.handleImageLoad_ = function() {
* @inheritDoc
* @api
*/
_ol_ImageTile_.prototype.load = function() {
ImageTile.prototype.load = function() {
if (this.state == TileState.ERROR) {
this.state = TileState.IDLE;
this.image_ = new Image();
@@ -157,7 +157,7 @@ _ol_ImageTile_.prototype.load = function() {
*
* @private
*/
_ol_ImageTile_.prototype.unlistenImage_ = function() {
ImageTile.prototype.unlistenImage_ = function() {
this.imageListenerKeys_.forEach(_ol_events_.unlistenByKey);
this.imageListenerKeys_ = null;
};
@@ -167,10 +167,10 @@ _ol_ImageTile_.prototype.unlistenImage_ = function() {
* Get a 1-pixel blank image.
* @return {HTMLCanvasElement} Blank image.
*/
_ol_ImageTile_.getBlankImage = function() {
ImageTile.getBlankImage = function() {
var ctx = createCanvasContext2D(1, 1);
ctx.fillStyle = 'rgba(0,0,0,0)';
ctx.fillRect(0, 0, 1, 1);
return ctx.canvas;
};
export default _ol_ImageTile_;
export default ImageTile;

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

@@ -3,7 +3,7 @@
*/
import {ENABLE_RASTER_REPROJECTION} from '../reproj/common.js';
import {getUid, inherits} from '../index.js';
import _ol_ImageTile_ from '../ImageTile.js';
import ImageTile from '../ImageTile.js';
import TileCache from '../TileCache.js';
import TileState from '../TileState.js';
import _ol_events_ from '../events.js';
@@ -57,7 +57,7 @@ var _ol_source_TileImage_ = function(options) {
* ?string, ol.TileLoadFunctionType, olx.TileOptions=)}
*/
this.tileClass = options.tileClass !== undefined ?
options.tileClass : _ol_ImageTile_;
options.tileClass : ImageTile;
/**
* @protected

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

@@ -3,7 +3,7 @@
*/
import {DEFAULT_TILE_SIZE} from '../tilegrid/common.js';
import {inherits} from '../index.js';
import _ol_ImageTile_ from '../ImageTile.js';
import ImageTile from '../ImageTile.js';
import TileState from '../TileState.js';
import {expandUrl, createFromTileUrlFunctions} from '../tileurlfunction.js';
import {assert} from '../asserts.js';
@@ -168,7 +168,7 @@ inherits(_ol_source_Zoomify_, _ol_source_TileImage_);
_ol_source_Zoomify_.Tile_ = function(
tileGrid, tileCoord, state, src, crossOrigin, tileLoadFunction, opt_options) {
_ol_ImageTile_.call(this, tileCoord, state, src, crossOrigin, tileLoadFunction, opt_options);
ImageTile.call(this, tileCoord, state, src, crossOrigin, tileLoadFunction, opt_options);
/**
* @private
@@ -182,7 +182,7 @@ _ol_source_Zoomify_.Tile_ = function(
*/
this.tileSize_ = _ol_size_.toSize(tileGrid.getTileSize(tileCoord[0]));
};
inherits(_ol_source_Zoomify_.Tile_, _ol_ImageTile_);
inherits(_ol_source_Zoomify_.Tile_, ImageTile);
/**
@@ -192,7 +192,7 @@ _ol_source_Zoomify_.Tile_.prototype.getImage = function() {
if (this.zoomifyImage_) {
return this.zoomifyImage_;
}
var image = _ol_ImageTile_.prototype.getImage.call(this);
var image = ImageTile.prototype.getImage.call(this);
if (this.state == TileState.LOADED) {
var tileSize = this.tileSize_;
if (image.width == tileSize[0] && image.height == tileSize[1]) {