moved handling of unrenderedFeatures from moveTo to drawFeature. r=elemoine (pullup #1723)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@7976 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -407,19 +407,14 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!zoomChanged && coordSysUnchanged) {
|
if(!zoomChanged && coordSysUnchanged) {
|
||||||
var unrenderedFeatures = {};
|
|
||||||
for(var i in this.unrenderedFeatures) {
|
for(var i in this.unrenderedFeatures) {
|
||||||
var feature = this.unrenderedFeatures[i];
|
var feature = this.unrenderedFeatures[i];
|
||||||
if(!this.drawFeature(feature)) {
|
this.drawFeature(feature);
|
||||||
unrenderedFeatures[i] = feature;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
this.unrenderedFeatures = unrenderedFeatures;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.drawn || zoomChanged || !coordSysUnchanged) {
|
if (!this.drawn || zoomChanged || !coordSysUnchanged) {
|
||||||
this.unrenderedFeatures = {};
|
|
||||||
this.drawn = true;
|
this.drawn = true;
|
||||||
var feature;
|
var feature;
|
||||||
for(var i=0, len=this.features.length; i<len; i++) {
|
for(var i=0, len=this.features.length; i<len; i++) {
|
||||||
@@ -429,9 +424,7 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
|
|||||||
this.renderer.locked = false;
|
this.renderer.locked = false;
|
||||||
}
|
}
|
||||||
feature = this.features[i];
|
feature = this.features[i];
|
||||||
if (!this.drawFeature(feature)) {
|
this.drawFeature(feature);
|
||||||
this.unrenderedFeatures[feature.id] = feature;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -483,9 +476,7 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.drawn) {
|
if (this.drawn) {
|
||||||
if(!this.drawFeature(feature)) {
|
this.drawFeature(feature);
|
||||||
this.unrenderedFeatures[feature.id] = feature;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (notify) {
|
if (notify) {
|
||||||
@@ -603,10 +594,6 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
|
|||||||
* Parameters:
|
* Parameters:
|
||||||
* feature - {<OpenLayers.Feature.Vector>}
|
* feature - {<OpenLayers.Feature.Vector>}
|
||||||
* style - {Object} Symbolizer hash or {String} renderIntent
|
* style - {Object} Symbolizer hash or {String} renderIntent
|
||||||
*
|
|
||||||
* Returns:
|
|
||||||
* {Boolean} true if the renderer was able to draw the feature, false
|
|
||||||
* otherwise
|
|
||||||
*/
|
*/
|
||||||
drawFeature: function(feature, style) {
|
drawFeature: function(feature, style) {
|
||||||
if (typeof style != "object") {
|
if (typeof style != "object") {
|
||||||
@@ -618,7 +605,11 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.renderer.drawFeature(feature, style);
|
if (!this.renderer.drawFeature(feature, style)) {
|
||||||
|
this.unrenderedFeatures[feature.id] = feature;
|
||||||
|
} else {
|
||||||
|
delete this.unrenderedFeatures[feature.id];
|
||||||
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user