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

Call getProjection() only once

Browse Source
This commit is contained in:
Andreas Hocevar
2017-11-08 21:08:19 +01:00
parent 3a6fc7a1f2
commit 0ec05f5795
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/tileimage.js
+4 -5
View File
@@ -237,11 +237,11 @@ ol.source.TileImage.prototype.createTile_ = function(z, x, y, pixelRatio, projec
* @inheritDoc * @inheritDoc
*/ */
ol.source.TileImage.prototype.getTile = function(z, x, y, pixelRatio, projection) { ol.source.TileImage.prototype.getTile = function(z, x, y, pixelRatio, projection) {
var sourceProjection = /** @type {!ol.proj.Projection} */ (this.getProjection());
if (!ol.ENABLE_RASTER_REPROJECTION || if (!ol.ENABLE_RASTER_REPROJECTION ||
!this.getProjection() || !sourceProjection || !projection ||
!projection || ol.proj.equivalent(sourceProjection, projection)) {
ol.proj.equivalent(this.getProjection(), projection)) { return this.getTileInternal(z, x, y, pixelRatio, sourceProjection || projection);
return this.getTileInternal(z, x, y, pixelRatio, /** @type {!ol.proj.Projection} */ (this.getProjection() || projection));
} else { } else {
var cache = this.getTileCacheForProjection(projection); var cache = this.getTileCacheForProjection(projection);
var tileCoord = [z, x, y]; var tileCoord = [z, x, y];
@@ -254,7 +254,6 @@ ol.source.TileImage.prototype.getTile = function(z, x, y, pixelRatio, projection
if (tile && tile.key == key) { if (tile && tile.key == key) {
return tile; return tile;
} else { } else {
var sourceProjection = /** @type {!ol.proj.Projection} */ (this.getProjection());
var sourceTileGrid = this.getTileGridForProjection(sourceProjection); var sourceTileGrid = this.getTileGridForProjection(sourceProjection);
var targetTileGrid = this.getTileGridForProjection(projection); var targetTileGrid = this.getTileGridForProjection(projection);
var wrappedTileCoord = var wrappedTileCoord =