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

modify feature control must use silent:true when removing/destroying vertices, p=me, r=crschmidt (closes #1562)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@7614 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2008-07-30 20:26:13 +00:00
parent eb417ff61c
commit c2c23cb3f3
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/OpenLayers/Control/ModifyFeature.js
View File

@@ -273,8 +273,8 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
var deactivated = false;
// the return from the controls is unimportant in this case
if(OpenLayers.Control.prototype.deactivate.apply(this, arguments)) {
this.layer.removeFeatures(this.vertices);
this.layer.removeFeatures(this.virtualVertices);
this.layer.removeFeatures(this.vertices, {silent: true});
this.layer.removeFeatures(this.virtualVertices, {silent: true});
this.vertices = [];
this.dragControl.deactivate();
if(this.feature && this.feature.geometry) {
@@ -314,16 +314,16 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
* unselected feature.
*/
unselectFeature: function(object) {
this.layer.removeFeatures(this.vertices);
this.layer.removeFeatures(this.vertices, {silent: true});
this.vertices = [];
this.layer.destroyFeatures(this.virtualVertices);
this.layer.destroyFeatures(this.virtualVertices, {silent: true});
this.virtualVertices = [];
if(this.dragHandle) {
this.layer.destroyFeatures([this.dragHandle]);
this.layer.destroyFeatures([this.dragHandle], {silent: true});
delete this.dragHandle;
}
if(this.radiusHandle) {
this.layer.destroyFeatures([this.radiusHandle]);
this.layer.destroyFeatures([this.radiusHandle], {silent: true});
delete this.radiusHandle;
}
this.feature = null;
@@ -413,17 +413,17 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
this.vertices.push(vertex);
} else if(vertex == this.dragHandle) {
// dragging a drag handle
this.layer.removeFeatures(this.vertices);
this.layer.removeFeatures(this.vertices, {silent: true});
this.vertices = [];
if(this.radiusHandle) {
this.layer.destroyFeatures([this.radiusHandle]);
this.layer.destroyFeatures([this.radiusHandle], {silent: true});
this.radiusHandle = null;
}
}
// dragging a radius handle - no special treatment
// dragging a real vertex - no special treatment
if(this.virtualVertices.length > 0) {
this.layer.destroyFeatures(this.virtualVertices);
this.layer.destroyFeatures(this.virtualVertices, {silent: true});
this.virtualVertices = [];
}
this.layer.drawFeature(this.feature, this.selectControl.renderIntent);
@@ -463,19 +463,19 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
this.dragControl.outFeature(this.dragControl.feature);
}
if(this.vertices.length > 0) {
this.layer.removeFeatures(this.vertices);
this.layer.removeFeatures(this.vertices, {silent: true});
this.vertices = [];
}
if(this.virtualVertices.length > 0) {
this.layer.removeFeatures(this.virtualVertices);
this.layer.removeFeatures(this.virtualVertices, {silent: true});
this.virtualVertices = [];
}
if(this.dragHandle) {
this.layer.destroyFeatures([this.dragHandle]);
this.layer.destroyFeatures([this.dragHandle], {silent: true});
this.dragHandle = null;
}
if(this.radiusHandle) {
this.layer.destroyFeatures([this.radiusHandle]);
this.layer.destroyFeatures([this.radiusHandle], {silent: true});
this.radiusHandle = null;
}
if(this.feature &&

20
lib/OpenLayers/Layer/Vector.js
View File

@@ -401,6 +401,8 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
}
this.features = OpenLayers.Util.removeItem(this.features, feature);
// feature has no layer at this point
feature.layer = null;
if (feature.geometry) {
this.renderer.eraseGeometry(feature.geometry);
@@ -432,21 +434,17 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
* features - {Array(<OpenLayers.Feature.Vector>)} An optional array of
* features to destroy. If not supplied, all features on the layer
* will be destroyed.
* options - {Object}
*/
destroyFeatures: function(features) {
var all = (features == undefined);
destroyFeatures: function(features, options) {
var all = (features == undefined); // evaluates to true if
// features is null
if(all) {
features = this.features;
this.selectedFeatures = [];
}
this.eraseFeatures(features);
var feature;
for(var i=features.length-1; i>=0; i--) {
feature = features[i];
if(!all) {
OpenLayers.Util.removeItem(this.selectedFeatures, feature);
}
feature.destroy();
this.removeFeatures(features, options);
for (var i = 0; i < features.length; i++) {
features[i].destroy();
}
},

10
tests/Control/ModifyFeature.html
View File

@@ -213,6 +213,11 @@
control.selectFeature({feature: fakeFeature});
control.destroy();
// layer.destroy() will call removeFeatures with an empty array, make
// removeFeatures reference an empty function to prevent the above
// test to fail
layer.removeFeatures = function(features) {};
layer.destroy();
}
@@ -323,6 +328,11 @@
control.dragComplete();
control.destroy();
// layer.destroy() will call removeFeatures with an empty array, make
// removeFeatures reference an empty function to prevent the above
// test to fail
layer.removeFeatures = function(verts) {};
layer.destroy();
}