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

Merge pull request #5270 from fredj/load_error

Browse Source 
Load erroneous image in ol.Image#load and ol.ImageTile#load
This commit is contained in:
Frédéric Junod
2016-06-08 09:25:57 +02:00
parent 3935b7db24 a598737ec5
commit e63b4d1f48
5 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/image.js
View File

@@ -122,10 +122,13 @@ ol.Image.prototype.handleImageLoad_ = function() {
/**
* Load not yet loaded URI.
* Load the image or retry if loading previously failed.
* Loading is taken care of by the tile queue, and calling this method is
* only needed for preloading or for reloading in case of an error.
* @api
*/
ol.Image.prototype.load = function() {
if (this.state == ol.ImageState.IDLE) {
if (this.state == ol.ImageState.IDLE || this.state == ol.ImageState.ERROR) {
this.state = ol.ImageState.LOADING;
this.changed();
goog.asserts.assert(!this.imageListenerKeys_,

7
src/ol/imagetile.js
View File

@@ -137,10 +137,13 @@ ol.ImageTile.prototype.handleImageLoad_ = function() {
/**
* Load not yet loaded URI.
* Load the image or retry if loading previously failed.
* Loading is taken care of by the tile queue, and calling this method is
* only needed for preloading or for reloading in case of an error.
* @api
*/
ol.ImageTile.prototype.load = function() {
if (this.state == ol.TileState.IDLE) {
if (this.state == ol.TileState.IDLE || this.state == ol.TileState.ERROR) {
this.state = ol.TileState.LOADING;
this.changed();
goog.asserts.assert(!this.imageListenerKeys_,

5
src/ol/tile.js
View File

@@ -107,6 +107,9 @@ ol.Tile.prototype.getState = function() {
/**
* FIXME empty description for jsdoc
* Load the image or retry if loading previously failed.
* Loading is taken care of by the tile queue, and calling this method is
* only needed for preloading or for reloading in case of an error.
* @api
*/
ol.Tile.prototype.load = goog.abstractMethod;