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

Factor out icon image loading code

Browse Source
This commit is contained in:
Éric Lemoine
2014-02-03 14:46:45 +01:00
parent f9e04ad7d5
commit 63aadc5c0f
3 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/ol/render/vector.js
View File

@@ -10,6 +10,7 @@ goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.render.IReplayGroup');
goog.require('ol.style.ImageState');
goog.require('ol.style.Style');
@@ -47,8 +48,51 @@ ol.renderer.vector.renderCircleGeometry_ =
* @param {ol.style.Style} style Style.
* @param {number} squaredTolerance Squared tolerance.
* @param {Object} data Opaque data object.
* @param {function(this: T, goog.events.Event)} listener Listener function.
* @param {T} thisArg Value to use as `this` when executing `listener`.
* @return {boolean} `true` if style is loading.
* @template T
*/
ol.renderer.vector.renderFeature = function(
replayGroup, feature, style, squaredTolerance, data, listener, thisArg) {
var loading = false;
var imageStyle, imageState;
imageStyle = style.getImage();
if (goog.isNull(imageStyle)) {
ol.renderer.vector.renderFeature_(
replayGroup, feature, style, squaredTolerance, data);
} else {
imageState = imageStyle.getImageState();
if (imageState == ol.style.ImageState.LOADED ||
imageState == ol.style.ImageState.ERROR) {
imageStyle.unlistenImageChange(listener, thisArg);
if (imageState == ol.style.ImageState.LOADED) {
ol.renderer.vector.renderFeature_(
replayGroup, feature, style, squaredTolerance, data);
}
} else {
if (imageState == ol.style.ImageState.IDLE) {
imageStyle.load();
}
imageState = imageStyle.getImageState();
goog.asserts.assert(imageState == ol.style.ImageState.LOADING);
imageStyle.listenImageChange(listener, thisArg);
loading = true;
}
}
return loading;
};
/**
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.Feature} feature Feature.
* @param {ol.style.Style} style Style.
* @param {number} squaredTolerance Squared tolerance.
* @param {Object} data Opaque data object.
* @private
*/
ol.renderer.vector.renderFeature_ = function(
replayGroup, feature, style, squaredTolerance, data) {
var geometry = feature.getGeometry();
if (goog.isNull(geometry)) {