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

Merge pull request #3128 from oterral/kml_default_style

Browse Source 
Allow rendering of feature when download of icon failed
This commit is contained in:
Éric Lemoine
2015-01-21 15:08:02 +01:00
parent b6a550f354 21144f161a
commit f625a29978
2 changed files with 137 additions and 28 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 imageStyle, imageState;
imageStyle = style.getImage();
if (goog.isNull(imageStyle)) {
ol.renderer.vector.renderFeature_(
replayGroup, feature, style, squaredTolerance);
} else {
if (!goog.isNull(imageStyle)) {
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);
}
} else {
if (imageState == ol.style.ImageState.IDLE) {
imageStyle.load();
@@ -110,6 +103,8 @@ ol.renderer.vector.renderFeature = function(
loading = true;
}
}
ol.renderer.vector.renderFeature_(replayGroup, feature, style,
squaredTolerance);
return loading;
};
@@ -254,6 +249,9 @@ ol.renderer.vector.renderPointGeometry_ =
goog.asserts.assertInstanceof(geometry, ol.geom.Point);
var imageStyle = style.getImage();
if (!goog.isNull(imageStyle)) {
if (imageStyle.getImageState() != ol.style.ImageState.LOADED) {
return;
}
var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
imageReplay.setImageStyle(imageStyle);
@@ -281,6 +279,9 @@ ol.renderer.vector.renderMultiPointGeometry_ =
goog.asserts.assertInstanceof(geometry, ol.geom.MultiPoint);
var imageStyle = style.getImage();
if (!goog.isNull(imageStyle)) {
if (imageStyle.getImageState() != ol.style.ImageState.LOADED) {
return;
}
var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
imageReplay.setImageStyle(imageStyle);