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

Dedicated module for image state enum

Browse Source
This commit is contained in:
Tim Schaub
2016-12-27 09:02:02 -07:00
parent 549503bd2e
commit 63a8a5a2cc
13 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ol/renderer/layer.js
View File

@@ -1,7 +1,7 @@
goog.provide('ol.renderer.Layer');
goog.require('ol');
goog.require('ol.Image');
goog.require('ol.ImageState');
goog.require('ol.Observable');
goog.require('ol.Tile');
goog.require('ol.asserts');
@@ -98,7 +98,7 @@ ol.renderer.Layer.prototype.getLayer = function() {
*/
ol.renderer.Layer.prototype.handleImageChange_ = function(event) {
var image = /** @type {ol.Image} */ (event.target);
if (image.getState() === ol.Image.State.LOADED) {
if (image.getState() === ol.ImageState.LOADED) {
this.renderIfReadyAndVisible();
}
};
@@ -114,24 +114,24 @@ ol.renderer.Layer.prototype.handleImageChange_ = function(event) {
*/
ol.renderer.Layer.prototype.loadImage = function(image) {
var imageState = image.getState();
if (imageState != ol.Image.State.LOADED &&
imageState != ol.Image.State.ERROR) {
if (imageState != ol.ImageState.LOADED &&
imageState != ol.ImageState.ERROR) {
// the image is either "idle" or "loading", register the change
// listener (a noop if the listener was already registered)
ol.DEBUG && console.assert(imageState == ol.Image.State.IDLE ||
imageState == ol.Image.State.LOADING,
ol.DEBUG && console.assert(imageState == ol.ImageState.IDLE ||
imageState == ol.ImageState.LOADING,
'imageState is "idle" or "loading"');
ol.events.listen(image, ol.events.EventType.CHANGE,
this.handleImageChange_, this);
}
if (imageState == ol.Image.State.IDLE) {
if (imageState == ol.ImageState.IDLE) {
image.load();
imageState = image.getState();
ol.DEBUG && console.assert(imageState == ol.Image.State.LOADING ||
imageState == ol.Image.State.LOADED,
ol.DEBUG && console.assert(imageState == ol.ImageState.LOADING ||
imageState == ol.ImageState.LOADED,
'imageState is "loading" or "loaded"');
}
return imageState == ol.Image.State.LOADED;
return imageState == ol.ImageState.LOADED;
};