Ticket #1071: selectfeature.patch

tests/Control/test_SelectFeature.html

@@ -23 +23 @@
-        var layer = new OpenLayers.Layer.Vector();
-        map.addLayer(layer);
-        var control = new OpenLayers.Control.SelectFeature(layer);
-h
+featureH
-            t.ok(true,
-                 "control.destroy calls destroy on feature handler");
-        }
@@ -47 +47 @@
-        t.eq(feature.style.strokeColor, OpenLayers.Feature.Vector.style['default'].strokeColor, "feature style is set back to old style");
-    }
-    
+    function test_Control_SelectFeature_multiple(t) {
+        t.plan(5);
+        var map = new OpenLayers.Map("map");
+        var layer = new OpenLayers.Layer.Vector();
+        map.addLayer(layer);
+        var control = new OpenLayers.Control.SelectFeature(layer, {'multiple': true, inclusiveBox: false });
+        var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(0,0));
+        var feature2 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,1));
+        layer.addFeatures([feature,feature2]);
+        layer.drawFeature = function() { }
+        control.setMap(map);
+        control.clickFeature(feature);
+        t.eq(feature.style.strokeColor, OpenLayers.Feature.Vector.style['select'].strokeColor, "feature style is set to select style");
+        control.clickFeature(feature);
+        t.eq(feature.style.strokeColor, OpenLayers.Feature.Vector.style['default'].strokeColor, "feature style is set back to old style");
+        map.getLonLatFromPixel = function(arg) {
+            return new OpenLayers.LonLat(arg.x, arg.y);
+        }    
+        control.selectBox(new OpenLayers.Bounds(-1, -1, 2, 2));
+        t.eq(layer.selectedFeatures.length, 2, "box around all features selects all features.")
+        control.selectBox(new OpenLayers.Bounds(-1, -1, .5, .5));
+        t.eq(layer.selectedFeatures.length, 1, "box around one feature turns that feature off with inclusiveBox false")
+        control.inclusiveBox = true;
+        control.selectBox(new OpenLayers.Bounds(-1, -1, 2, 2));
+        t.eq(layer.selectedFeatures.length, 2, "inclusiveBox lets all features turn on even when one is on already.")
+
+    }
+    
-    function test_Control_SelectFeature_activate(t) {
-        t.plan(2);
-        var map = new OpenLayers.Map("map");
@@ -54 +82 @@
-        map.addLayer(layer);
-        var control = new OpenLayers.Control.SelectFeature(layer);
-        map.addControl(control);
-h
+featureH
-             "feature handler is not active prior to activating control");
-        control.activate();
-h
+featureH
-             "feature handler is active after activating control");
-    }
-
@@ -70 +98 @@
-        map.addControl(control);
-        
-        control.activate();
-h
+featureH
-            t.ok(true,
-                 "control.deactivate calls deactivate on feature handler");
-        }

lib/OpenLayers/Control/SelectFeature.js

@@ -20 +20 @@
-     * {Boolean} Allow selection of multiple geometries
-     */
-    multiple: false, 
+    
+    /**
+     * APIProperty: inclusiveBox
+     * {Boolean} If this is true, then when a box is drawn (in multiple feature
+     * selection mode), all intersected features will be selected, even if they 
+     * were already selected. Otherwise, the box will switch the state of any
+     * features. Default is true.
+     */
+    inclusiveBox: true, 
-
+
-    /**
-     * APIProperty: hover
-     * {Boolean} Select on mouse over and deselect on mouse out.  If true, this
@@ -89 +99 @@
-                                                  out: this.outFeature
-                                                }, this.callbacks);
-        var handlerOptions = {geometryTypes: this.geometryTypes};
-h
+featureH
-                                                      this.callbacks,
-                                                      handlerOptions);
+        if (this.multiple) {
+            this.boxHandler = new OpenLayers.Handler.Box( this,
+                  {done: this.selectBox}, {
+                      keyMask: OpenLayers.Handler.MOD_SHIFT,
+                      boxDivClassName: "olControlSelectFeatureSelectBox"
+                  } );
+        }                    
-    },
+    
+    /**
+     * Method: activate
+     */
+    activate: function() {
+        this.featureHandler.activate();
+        if (this.boxHandler) {
+            this.boxHandler.activate();
+        }    
+        return OpenLayers.Control.prototype.activate.apply(this,arguments);
+    },
-
-    /**
+     * Method: deactivate
+     */
+    deactivate: function() {
+        if (this.boxHandler) {
+            this.boxHandler.deactivate();
+        }
+        this.featureHandler.deactivate();
+        return OpenLayers.Control.prototype.deactivate.apply(this,arguments);
+    },
+
+    /**
+     * Method: destroy
+     */
+    destroy: function() {
+        this.featureHandler.destroy();
+        if (this.boxHandler) {
+            this.boxHandler.destroy();
+        }    
+        return OpenLayers.Control.prototype.destroy.apply(this,arguments);
+    },
+        
+    /**
+     * Method: selectBox
+     * Callback from the boxHandler set up when multiple feature selection is on.
+     * depending on the inclusiveBox setting, will either select all features which
+     * intersect the given bounds, or toggle the feature selection status.
+     * If passed a bounds (shift-click) has no effect.
+     *
+     * Parameters:
+     * feature - {<OpenLayers.Bounds> || <OpenLayers.LonLat> }  
+     */
+    selectBox: function (position) {
+        if (position instanceof OpenLayers.Bounds) {
+            var minXY = this.map.getLonLatFromPixel(
+                            new OpenLayers.Pixel(position.left, position.bottom));
+            var maxXY = this.map.getLonLatFromPixel(
+                            new OpenLayers.Pixel(position.right, position.top));
+            var bounds = new OpenLayers.Bounds(minXY.lon, minXY.lat,
+                                               maxXY.lon, maxXY.lat);
+            for(var i = 0; i < this.layer.features.length; i++) {
+                var feature = this.layer.features[i]; 
+                if (bounds.intersectsBounds(feature.geometry.getBounds())) {
+                    if (this.inclusiveBox) {
+                        if(OpenLayers.Util.indexOf(this.layer.selectedFeatures, feature) == -1) {
+                            this.select(feature);
+                        }    
+                    } else {
+                        this.clickFeature(feature)
+                    }    
+                }
+            }    
+        }
+    },
+
+    /**
-     * Method: clickFeature
-     * Called when the feature handler detects a click on a feature
-     *
@@ -202 +285 @@
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-
+
+
+
+
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-    },
-