Changeset 5470

Timestamp:

12/17/07 09:36:39 (1 year ago)

Author:

elemoine

Message:

Do not call preFeatureInsert() and onFeatureInsert() callbacks when the modify feature control and the regular polygon handler internally adds point geometries to the layer. This is accomplished by adding an 'options' argument to the addFeatures() method in Layer.Vector. If that options argument has the silent property set to true, then the preFeatureInsert() and onFeatureInsert() callbacks aren't called. Thanks tschaub and fredj for your input. Thanks crschmidt for the final review. (closes #1148)

Files:

• trunk/openlayers/lib/OpenLayers/Control/ModifyFeature.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Handler/RegularPolygon.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Vector.js (modified) (3 diffs)
• trunk/openlayers/tests/Layer/test_Vector.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Control/ModifyFeature.js

@@ -515 +515 @@
-        }
-        collectComponentVertices.call(this, this.feature.geometry);
-
-
+, {silent: true}
+, {silent: true}
-    },
-
@@ -535 +535 @@
-        }
-        this.dragHandle = origin;
-
+, {silent: true}
-    },
-
@@ -575 +575 @@
-        }
-        this.radiusHandle = radius;
-
+, {silent: true}
-    },
-

trunk/openlayers/lib/OpenLayers/Handler/RegularPolygon.js

@@ -217 +217 @@
-        this.feature = new OpenLayers.Feature.Vector();
-        this.createGeometry();
-
+, {silent: true}
-        this.layer.drawFeature(this.feature, this.style);
-    },

trunk/openlayers/lib/OpenLayers/Layer/Vector.js

@@ -243 +243 @@
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} 
-
-
+
+
+
-        if (!(features instanceof Array)) {
-            features = [features];
-        }
+        
+        var notify = !options || !options.silent;
-
-        for (var i = 0; i < features.length; i++) {
@@ -268 +271 @@
-            }
-
-
+
+
+
-
-            if (this.drawn) {
@@ -274 +279 @@
-            }
-            
-
+
+
+
-        }
-    },

trunk/openlayers/tests/Layer/test_Vector.html

@@ -17 +17 @@
-    
-    function test_02_Layer_Vector_addFeatures(t) {
-2
+4
-    
-        var layer = new OpenLayers.Layer.Vector(name);
@@ -23 +23 @@
-        var point = new OpenLayers.Geometry.Point(-111.04, 45.68);
-        var pointFeature = new OpenLayers.Feature.Vector(point);
+
+        layer.preFeatureInsert = function(feature) {
+            t.ok(feature == pointFeature, "OpenLayers.Layer.Vector.addFeatures calls preFeatureInsert with the right arg");
+        }
+        layer.onFeatureInsert = function(feature) {
+            t.ok(feature == pointFeature, "OpenLayers.Layer.Vector.addFeatures calls onFeatureInsert with the right arg");
+        }
+
-        layer.addFeatures([pointFeature]);
-        
-        t.eq(layer.features.length, 1, "OpenLayers.Layer.Vector.addFeatures adds something to the array");
-        t.ok(layer.features[0] == pointFeature, "OpenLayers.Layer.Vector.addFeatures returns an array of features");
+
+        layer.preFeatureInsert = function(feature) {
+            t.fail("OpenLayers.Layer.Vector.addFeatures calls preFeatureInsert while it must not");
+        }
+        layer.onFeatureInsert = function(feature) {
+            t.fail("OpenLayers.Layer.Vector.addFeatures calls onFeatureInsert while it must not");
+        }
+
+        layer.addFeatures([pointFeature], {silent: true});
-    }
-