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

Merge pull request #663 from twpayne/render-error-tiles-as-empty

Browse Source 
Render error tiles as empty
This commit is contained in:
Tom Payne
2013-04-28 08:21:51 -07:00
parent 65a2aef4ed c576b2a34e
commit 5bfef2805d
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/imagetile.js
View File

@@ -104,7 +104,11 @@ ol.ImageTile.prototype.handleImageError_ = function() {
* @private * @private
*/ */
ol.ImageTile.prototype.handleImageLoad_ = function() { ol.ImageTile.prototype.handleImageLoad_ = function() {
this.state = ol.TileState.LOADED; if (this.image_.naturalWidth && this.image_.naturalHeight) {
this.state = ol.TileState.LOADED;
} else {
this.state = ol.TileState.EMPTY;
}
this.unlistenImage_(); this.unlistenImage_();
this.dispatchChangeEvent(); this.dispatchChangeEvent();
}; };

10
src/ol/renderer/canvas/canvastilelayerrenderer.js
View File

@@ -279,11 +279,11 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
tile = tileSource.getTile(z, x, y, projection); tile = tileSource.getTile(z, x, y, projection);
tileState = tile.getState(); tileState = tile.getState();
if (tileState == ol.TileState.LOADED || tileState == ol.TileState.EMPTY) { if (tileState == ol.TileState.LOADED ||
tileState == ol.TileState.EMPTY ||
tileState == ol.TileState.ERROR) {
tilesToDrawByZ[z][tile.tileCoord.toString()] = tile; tilesToDrawByZ[z][tile.tileCoord.toString()] = tile;
continue; continue;
} else if (tileState == ol.TileState.ERROR) {
continue;
} }
allTilesLoaded = false; allTilesLoaded = false;
@@ -335,7 +335,9 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
x = tileSize.width * (tile.tileCoord.x - canvasTileRange.minX); x = tileSize.width * (tile.tileCoord.x - canvasTileRange.minX);
y = tileSize.height * (canvasTileRange.maxY - tile.tileCoord.y); y = tileSize.height * (canvasTileRange.maxY - tile.tileCoord.y);
tileState = tile.getState(); tileState = tile.getState();
if (tileState == ol.TileState.EMPTY || !opaque) { if (tileState == ol.TileState.EMPTY ||
tileState == ol.TileState.ERROR ||
!opaque) {
context.clearRect(x, y, tileSize.width, tileSize.height); context.clearRect(x, y, tileSize.width, tileSize.height);
} }
if (tileState == ol.TileState.LOADED) { if (tileState == ol.TileState.LOADED) {