diff --git a/src/ol/source/tileimagesource.js b/src/ol/source/tileimagesource.js index c06c4bc3bc..9e2c850cf3 100644 --- a/src/ol/source/tileimagesource.js +++ b/src/ol/source/tileimagesource.js @@ -129,8 +129,9 @@ ol.source.TileImage.prototype.expireCache = function(projection, usedTiles) { * @inheritDoc */ ol.source.TileImage.prototype.getTileGridForProjection = function(projection) { + var thisProj = this.getProjection(); if (!goog.isNull(this.tileGrid) && - ol.proj.equivalent(this.getProjection(), projection)) { + (goog.isNull(thisProj) || ol.proj.equivalent(thisProj, projection))) { return this.tileGrid; } else { var projKey = goog.getUid(projection).toString(); @@ -147,7 +148,8 @@ ol.source.TileImage.prototype.getTileGridForProjection = function(projection) { * @inheritDoc */ ol.source.TileImage.prototype.getTileCacheForProjection = function(projection) { - if (ol.proj.equivalent(this.getProjection(), projection)) { + var thisProj = this.getProjection(); + if (goog.isNull(thisProj) || ol.proj.equivalent(thisProj, projection)) { return this.tileCache; } else { var projKey = goog.getUid(projection).toString(); diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js index d2c8812d3f..86f4982fac 100644 --- a/src/ol/source/tilesource.js +++ b/src/ol/source/tilesource.js @@ -221,8 +221,8 @@ ol.source.Tile.prototype.getTileGridForProjection = function(projection) { * @protected */ ol.source.Tile.prototype.getTileCacheForProjection = function(projection) { - if (goog.isNull(this.tileCache) || - !ol.proj.equivalent(this.getProjection(), projection)) { + var thisProj = this.getProjection(); + if (!goog.isNull(thisProj) && !ol.proj.equivalent(thisProj, projection)) { return null; } else { return this.tileCache;