Ticket #1427: t1427.patch

tests/Control/ModifyFeature.html

@@ -164 +164 @@
-    }    
-
-    function test_selectFeature(t) {
-
-
+
+
+
+
+
-        var control = new OpenLayers.Control.ModifyFeature(layer);
-        control.vertices = [];
-        control.virtualVertices = [];
-
-
-
+
+
+
+
-        control.dragControl.activate = function() { t.ok(true, "drag Control activated"); }
-        control.onModificationStart = function(feature)  { t.eq(feature.id, fakeFeature.id, "On Modification Start called with correct feature."); } 
-        
-        
-        // Start of testing
-        
-        control.collectVertices = function() { t.fail("Collect vertices called when geom is a point"); }
-{'id':'myFakeFeature','geometry':{'CLASS_NAME':'OpenLayers.Geometry.Point'}}
+new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(0, 0))
-        
-        // Points don't call collectVertices
-        control.selectFeature({feature: fakeFeature});
@@ -195 +198 @@
-        layer.addFeatures = function(features) { 
-            t.ok(features == 'a' || features == 'd', "features passed correctly"); 
-        }
-        fakeFeature.geometry.CLASS_NAME='OpenLayers.Geometry.Polygon';
-        
+        fakeFeature.geometry = new OpenLayers.Geometry.Polygon([
+            new OpenLayers.Geometry.LinearRing([
+                new OpenLayers.Geometry.Point(0, 0),
+                new OpenLayers.Geometry.Point(1, 1)
+            ])
+        ]);
+        
-        // OnSelect calls collectVertices and passes features to layer 
-        control.selectFeature({feature: fakeFeature});
-        
@@ -349 +358 @@
-    }
-
-    function test_onModificationStart(t) {
-2
+1
-        var map = new OpenLayers.Map("map");
-        var layer = new OpenLayers.Layer.Vector();
-        map.addLayer(layer);
@@ -357 +366 @@
-        map.addControl(control);
-        control.activate();
-        
-        // test that beforefeaturemodified is triggered
-        layer.events.on({"beforefeaturemodified": function(event) {
-            t.eq(event.feature.id, testFeature.id,
-                 "beforefeaturemodified is triggered with correct feature");
-        }});
-        
-        // make sure onModificationStart is called on feature selection
-        var testFeature = new OpenLayers.Feature.Vector(
-            new OpenLayers.Geometry.Point(Math.random(), Math.random())
@@ -445 +448 @@
-        
-        map.destroy();
-    }
+    
+    function test_events(t) {
+        t.plan(2);
+        var map = new OpenLayers.Map("map");
+        var layer = new OpenLayers.Layer.Vector();
+        map.addLayer(layer);
+        var control = new OpenLayers.Control.ModifyFeature(layer);
+        map.addControl(control);
+        control.activate();
+        
+        // make sure onModificationStart is called on feature selection
+        var testFeature = new OpenLayers.Feature.Vector(
+            new OpenLayers.Geometry.Point(Math.random(), Math.random())
+        );
+        
+        // test that beforefeatureselected is triggered
+        function handle_beforefeatureselected(event) {
+            t.ok(event.feature == testFeature, "beforefeatureselected called with the correct feature");
+        }
+        layer.events.on({
+            "beforefeatureselected": handle_beforefeatureselected
+        });
+        layer.events.triggerEvent("beforefeatureselected", {
+            feature: testFeature
+        });
+        layer.events.un({
+            "beforefeatureselected": handle_beforefeatureselected
+        });
+        
+        // test that beforefeatureselected is triggered
+        function handle_featureselected(event) {
+            t.ok(event.feature == testFeature, "featureselected called with the correct feature");
+        }
+        layer.events.on({
+            "featureselected": handle_featureselected
+        });
+        layer.events.triggerEvent("featureselected", {
+            feature: testFeature
+        });
+        layer.events.un({
+            "featureselected": handle_featureselected
+        });
-
+        map.destroy();
+    }
-
+
+
-    </script>
-</head>
-<body>

lib/OpenLayers/Control/SelectFeature.js

@@ -308 +308 @@
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    select: function(feature) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-
-    /**
@@ -323 +328 @@
-     * normal, and call the onUnselect function.
-     *
-     * Parameters:
- 
+
-     */
-    unselect: function(feature) {
-        // Store feature style for restoration later

lib/OpenLayers/Control/ModifyFeature.js

@@ -201 +201 @@
-            layer, selectOptions
-        );
-        this.layer.events.on({
+            "beforefeatureselected": this.beforeSelectFeature,
-            "featureselected": this.selectFeature,
-            "featureunselected": this.unselectFeature,
-            scope: this
@@ -239 +240 @@
-     */
-    destroy: function() {
-        this.layer.events.un({
+            "beforefeatureselected": this.beforeSelectFeature,
-            "featureselected": this.selectFeature,
-            "featureunselected": this.unselectFeature,
-            scope: this
@@ -287 +289 @@
-        }
-        return deactivated;
-    },
+    
+    /**
+     * Method: beforeSelectFeature
+     * Called before a feature is selected.
+     *
+     * Parameters:
+     * object - {Object} Object with a feature property referencing the
+     *     selected feature.
+     */
+    beforeSelectFeature: function(object) {
+        return this.layer.events.triggerEvent(
+            "beforefeaturemodified", {feature: object.feature}
+        );
+    },
-
-    /**
-     * Method: selectFeature
@@ -301 +317 @@
-        this.resetVertices();
-        this.dragControl.activate();
-        this.onModificationStart(this.feature);
-        this.layer.events.triggerEvent("beforefeaturemodified", 
-                                       {feature: this.feature});
-    },
-
-    /**

lib/OpenLayers/Layer/Vector.js

@@ -72 +72 @@
-     */
-    EVENT_TYPES: ["beforefeatureadded", "featureadded", "featuresadded",
-                  "beforefeatureremoved", "featureremoved", "featuresremoved",
-
+beforefeatureselected", "
-                  "beforefeaturemodified", "featuremodified", "afterfeaturemodified"],
-
-    /**

examples/modify-feature.html

@@ -29 +29 @@
-            map.addControl(new OpenLayers.Control.LayerSwitcher());
-            map.addControl(new OpenLayers.Control.MousePosition());
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            controls = {
-                point: new OpenLayers.Control.DrawFeature(vectors,
-                            OpenLayers.Handler.Point),
@@ -53 +47 @@
-                regular: new OpenLayers.Control.DrawFeature(vectors,
-                            OpenLayers.Handler.RegularPolygon,
-                            {handlerOptions: {sides: 5}}),
-
-
+
-            };
-            
-            for(var key in controls) {