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

Merge pull request #6972 from ahocevar/loaded-error-tiles

Browse Source 
Handle error tiles properly
This commit is contained in:
Andreas Hocevar
2017-06-29 09:33:33 +02:00
committed by GitHub
parent 991328904d 970265acb0
commit f88d8b8a7d
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ol/renderer/canvas/tilelayer.js
View File

@@ -144,9 +144,14 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame = function(frameState, layer
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
for (y = tileRange.minY; y <= tileRange.maxY; ++y) {
tile = tileSource.getTile(z, x, y, pixelRatio, projection);
// When useInterimTilesOnError is false, we consider the error tile as loaded.
if (tile.getState() == ol.TileState.ERROR && !this.getLayer().getUseInterimTilesOnError()) {
tile.setState(ol.TileState.LOADED);
if (tile.getState() == ol.TileState.ERROR) {
if (!tileLayer.getUseInterimTilesOnError()) {
// When useInterimTilesOnError is false, we consider the error tile as loaded.
tile.setState(ol.TileState.LOADED);
} else if (tileLayer.getPreload() > 0) {
// Preloaded tiles for lower resolutions might have finished loading.
newTiles = true;
}
}
if (!this.isDrawableTile_(tile)) {
tile = tile.getInterimTile();

19
src/ol/vectorimagetile.js
View File

@@ -244,17 +244,18 @@ ol.VectorImageTile.prototype.load = function() {
*/
ol.VectorImageTile.prototype.finishLoading_ = function() {
var errors = false;
var tile;
for (var i = this.tileKeys.length - 1; i >= 0; --i) {
tile = this.getTile(this.tileKeys[i]);
if (tile.getState() == ol.TileState.ERROR) {
errors = true;
}
if (tile.getState() != ol.TileState.LOADED) {
this.tileKeys.splice(i, 1);
var loaded = this.tileKeys.length;
var state;
for (var i = loaded - 1; i >= 0; --i) {
state = this.getTile(this.tileKeys[i]).getState();
if (state != ol.TileState.LOADED) {
if (state == ol.TileState.ERROR) {
errors = true;
}
--loaded;
}
}
this.setState(this.tileKeys.length > 0 ?
this.setState(loaded > 0 ?
ol.TileState.LOADED :
(errors ? ol.TileState.ERROR : ol.TileState.EMPTY));
};