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

Allow rendering of feature when download of icon failed

Browse Source
This commit is contained in:
oterral
2015-01-14 09:34:03 +01:00
parent 35468e2bbb
commit c97a29d13b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,18 +88,11 @@ ol.renderer.vector.renderFeature = function(
var loading = false; var loading = false;
var imageStyle, imageState; var imageStyle, imageState;
imageStyle = style.getImage(); imageStyle = style.getImage();
if (goog.isNull(imageStyle)) { if (!goog.isNull(imageStyle)) {
ol.renderer.vector.renderFeature_(
replayGroup, feature, style, squaredTolerance);
} else {
imageState = imageStyle.getImageState(); imageState = imageStyle.getImageState();
if (imageState == ol.style.ImageState.LOADED || if (imageState == ol.style.ImageState.LOADED ||
imageState == ol.style.ImageState.ERROR) { imageState == ol.style.ImageState.ERROR) {
imageStyle.unlistenImageChange(listener, thisArg); imageStyle.unlistenImageChange(listener, thisArg);
if (imageState == ol.style.ImageState.LOADED) {
ol.renderer.vector.renderFeature_(
replayGroup, feature, style, squaredTolerance);
}
} else { } else {
if (imageState == ol.style.ImageState.IDLE) { if (imageState == ol.style.ImageState.IDLE) {
imageStyle.load(); imageStyle.load();
@@ -110,6 +103,8 @@ ol.renderer.vector.renderFeature = function(
loading = true; loading = true;
} }
} }
ol.renderer.vector.renderFeature_(replayGroup, feature, style,
squaredTolerance);
return loading; return loading;
}; };
@@ -254,6 +249,9 @@ ol.renderer.vector.renderPointGeometry_ =
goog.asserts.assertInstanceof(geometry, ol.geom.Point); goog.asserts.assertInstanceof(geometry, ol.geom.Point);
var imageStyle = style.getImage(); var imageStyle = style.getImage();
if (!goog.isNull(imageStyle)) { if (!goog.isNull(imageStyle)) {
if (imageStyle.getImageState() != ol.style.ImageState.LOADED) {
return;
}
var imageReplay = replayGroup.getReplay( var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE); style.getZIndex(), ol.render.ReplayType.IMAGE);
imageReplay.setImageStyle(imageStyle); imageReplay.setImageStyle(imageStyle);
@@ -281,6 +279,9 @@ ol.renderer.vector.renderMultiPointGeometry_ =
goog.asserts.assertInstanceof(geometry, ol.geom.MultiPoint); goog.asserts.assertInstanceof(geometry, ol.geom.MultiPoint);
var imageStyle = style.getImage(); var imageStyle = style.getImage();
if (!goog.isNull(imageStyle)) { if (!goog.isNull(imageStyle)) {
if (imageStyle.getImageState() != ol.style.ImageState.LOADED) {
return;
}
var imageReplay = replayGroup.getReplay( var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE); style.getZIndex(), ol.render.ReplayType.IMAGE);
imageReplay.setImageStyle(imageStyle); imageReplay.setImageStyle(imageStyle);