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

Better handling of tilegrids without extent during reprojection

Browse Source 
For WMTS source, the tilegrid has no extent, but the projection can
This commit is contained in:
Petr Sloup
2015-07-22 10:32:04 +02:00
parent be6bf00d74
commit ebc1bc0096
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ol/reproj/tile.js
View File

@@ -97,6 +97,18 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
return; return;
} }
if (!sourceProj.isGlobal()) {
var sourceProjExtent = sourceProj.getExtent();
if (!goog.isNull(sourceProjExtent)) {
if (goog.isNull(maxSourceExtent)) {
maxSourceExtent = sourceProjExtent;
} else {
maxSourceExtent = ol.extent.getIntersection(
maxSourceExtent, sourceProjExtent);
}
}
}
var targetResolution = targetTileGrid.getResolution(z); var targetResolution = targetTileGrid.getResolution(z);
var errorThresholdInPixels = ol.DEFAULT_RASTER_REPROJ_ERROR_THRESHOLD; var errorThresholdInPixels = ol.DEFAULT_RASTER_REPROJ_ERROR_THRESHOLD;
@@ -133,11 +145,6 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
this.srcZ_ = sourceTileGrid.getZForResolution(sourceResolution); this.srcZ_ = sourceTileGrid.getZForResolution(sourceResolution);
var srcExtent = this.triangulation_.calculateSourceExtent(); var srcExtent = this.triangulation_.calculateSourceExtent();
var sourceProjExtent = sourceProj.getExtent();
if (!sourceProj.isGlobal() && sourceProjExtent) {
srcExtent = ol.extent.getIntersection(srcExtent, sourceProjExtent);
}
if (!goog.isNull(maxSourceExtent) && if (!goog.isNull(maxSourceExtent) &&
!ol.extent.intersects(maxSourceExtent, srcExtent)) { !ol.extent.intersects(maxSourceExtent, srcExtent)) {
this.state = ol.TileState.EMPTY; this.state = ol.TileState.EMPTY;
@@ -167,10 +174,8 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
} }
var tilesRequired = xRange.length * srcRange.getHeight(); var tilesRequired = xRange.length * srcRange.getHeight();
goog.asserts.assert(tilesRequired < ol.RASTER_REPROJ_MAX_SOURCE_TILES, if (!goog.asserts.assert(tilesRequired < ol.RASTER_REPROJ_MAX_SOURCE_TILES,
'reasonable number of tiles is required'); 'reasonable number of tiles is required')) {
if (tilesRequired > ol.RASTER_REPROJ_MAX_SOURCE_TILES) {
this.state = ol.TileState.ERROR; this.state = ol.TileState.ERROR;
return; return;
} }