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

Vector renderer uses new image style interface

Browse Source
This commit is contained in:
Éric Lemoine
2014-02-03 14:03:07 +01:00
parent ae2b3359f8
commit 78aef2f58c
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
View File

@@ -2,7 +2,6 @@ goog.provide('ol.renderer.canvas.VectorLayer');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.events'); goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('goog.functions'); goog.require('goog.functions');
goog.require('ol.ViewHint'); goog.require('ol.ViewHint');
goog.require('ol.extent'); goog.require('ol.extent');
@@ -157,12 +156,9 @@ ol.renderer.canvas.VectorLayer.prototype.getRenderGeometryFunction_ =
* @param {goog.events.Event} event Image style change event. * @param {goog.events.Event} event Image style change event.
* @private * @private
*/ */
ol.renderer.canvas.VectorLayer.prototype.handleImageStyleChange_ = ol.renderer.canvas.VectorLayer.prototype.handleImageChange_ =
function(event) { function(event) {
var imageStyle = /** @type {ol.style.Image} */ (event.target);
if (imageStyle.getImageState() == ol.style.ImageState.LOADED) {
this.renderIfReadyAndVisible(); this.renderIfReadyAndVisible();
}
}; };
@@ -262,21 +258,27 @@ ol.renderer.canvas.VectorLayer.prototype.renderFeature =
for (i = 0, ii = styles.length; i < ii; ++i) { for (i = 0, ii = styles.length; i < ii; ++i) {
style = styles[i]; style = styles[i];
imageStyle = style.getImage(); imageStyle = style.getImage();
if (!goog.isNull(imageStyle)) { if (goog.isNull(imageStyle)) {
if (imageStyle.getImageState() == ol.style.ImageState.IDLE) { ol.renderer.vector.renderFeature(
goog.events.listenOnce(imageStyle, goog.events.EventType.CHANGE, replayGroup, feature, style, squaredTolerance, feature);
this.handleImageStyleChange_, false, this); } else {
imageStyle.load(); imageState = imageStyle.getImageState();
} else if (imageStyle.getImageState() == ol.style.ImageState.LOADED) { if (imageState == ol.style.ImageState.LOADED ||
imageState == ol.style.ImageState.ERROR) {
imageStyle.unlistenImageChange(this.handleImageChange_, this);
if (imageState == ol.style.ImageState.LOADED) {
ol.renderer.vector.renderFeature( ol.renderer.vector.renderFeature(
replayGroup, feature, style, squaredTolerance, feature); replayGroup, feature, style, squaredTolerance, feature);
} }
goog.asserts.assert(
imageStyle.getImageState() != ol.style.ImageState.IDLE);
loading = imageStyle.getImageState() == ol.style.ImageState.LOADING;
} else { } else {
ol.renderer.vector.renderFeature( if (imageState == ol.style.ImageState.IDLE) {
replayGroup, feature, style, squaredTolerance, feature); imageStyle.load();
}
imageState = imageStyle.getImageState();
goog.asserts.assert(imageState == ol.style.ImageState.LOADING);
imageStyle.listenImageChange(this.handleImageChange_, this);
loading = true;
}
} }
} }
return loading; return loading;