Changeset 10035

Timestamp:

02/09/10 12:30:02 (1 month ago)

Author:

ahocevar

Message:

Give the GetFeature control a beforefeaturesselected and featuresselected event. p=komacke, r=me (closes #2442)

Files:

• trunk/openlayers/lib/OpenLayers/Control/GetFeature.js (modified) (4 diffs)
• trunk/openlayers/tests/Control/GetFeature.html (modified) (3 diffs)

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

@@ -162 +162 @@
-     *      selected. The event object has a feature property with the
-     *      selected feature
+     * beforefeaturesselected - Triggered when <click> is true before a
+     *      set of features is selected. The event object is an array of
+     *      feature properties with the features about to be selected.  
+     *      Return false after receiving this event to discontinue processing
+     *      of all featureselected events and the featuresselected event.
+     * featuresselected - Triggered when <click> is true and a set of
+     *      features is selected.  The event object is an array of feature
+     *      properties of the selected features
-     * featureunselected - Triggered when <click> is true and a feature is
-     *      unselected. The event object has a feature property with the
@@ -172 +180 @@
-     *      moved away from a hover-selected feature
-     */
-
-
+
+
+
-
-    /**
@@ -436 +445 @@
-     * Method: select
-     * Add feature to the hash of selected features and trigger the
-event
+and featuresselected events
-     * 
-     * Parameters:
@@ -449 +458 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
+            this.events.triggerEvent("featuresselected", {
+                features: selectedFeatures
+            });
-        }
-    },

trunk/openlayers/tests/Control/GetFeature.html

@@ -23 +23 @@
-    
-    function test_Control_GetFeature_select(t) {
-3
+5
-        var map = new OpenLayers.Map("map");
-        var layer = new OpenLayers.Layer.WMS("foo", "wms", {
@@ -32 +32 @@
-        var feature1 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,2));
-        var feature2 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(2,3));
+        var feature3 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(3,1));
-        var control = new OpenLayers.Control.GetFeature({
-            protocol: new OpenLayers.Protocol({
-                read: function(obj) {
-                    obj.callback.call(obj.scope, {
-
+, feature3
-                        success: function() {return true;}
-                    });
@@ -52 +53 @@
-        control.events.unregister("featureselected", this, singleTest);
-        
-
+
+
+
+
+
+
-        var boxTest = function(evt) {
-            features.push(evt.feature);
-        }
+        var beforeFeaturesSelected = function(evt) {
+            t.eq(evt.features.length, 3, "3 features passed to the beforefeaturesselected handler");
+        }
+        var featuresSelected = function(evt) {
+            t.eq(evt.features.length, 2, "2 features passed to the featuresselected handler");
+        }
+        control.events.register("beforefeatureselected", this, beforeFeatureSelected);
-        control.events.register("featureselected", this, boxTest);
+        control.events.register("beforefeaturesselected", this, beforeFeaturesSelected);
+        control.events.register("featuresselected", this, featuresSelected);
-        control.selectBox(new OpenLayers.Bounds(0,0,4,4));
+        control.events.unregister("beforefeatureselected", this, beforeFeatureSelected);
-        control.events.unregister("featureselected", this, boxTest);
+        control.events.unregister("beforefeaturesselected", this, beforeFeaturesSelected);
+        control.events.unregister("featuresselected", this, featuresSelected);
-        t.eq(features.length, 2, "2 features inside box selected");
-        t.eq(features[1].id, feature2.id, "featureselected callback called with multiple features");