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

…empty Render error tiles as empty
KoAi · Apr 28, 2013 · 5bfef28 · 5bfef28
2 parents 65a2aef + c576b2a
commit 5bfef28
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/ol/imagetile.js b/src/ol/imagetile.js
@@ -104,7 +104,11 @@ ol.ImageTile.prototype.handleImageError_ = function() {
  * @private
  */
 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.dispatchChangeEvent();
 };

diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js
@@ -279,11 +279,11 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
 
       tile = tileSource.getTile(z, x, y, projection);
       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;
         continue;
-      } else if (tileState == ol.TileState.ERROR) {
-        continue;
       }
 
       allTilesLoaded = false;
@@ -335,7 +335,9 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
           x = tileSize.width * (tile.tileCoord.x - canvasTileRange.minX);
           y = tileSize.height * (canvasTileRange.maxY - tile.tileCoord.y);
           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);
           }
           if (tileState == ol.TileState.LOADED) {