Ticket #1071: patch-1071-r7546-A0.diff

theme/default/style.css

@@ -215 +215 @@
-    background-position: 0px 1px;
-}
-
-
+, .olHandlerBoxFeatureSelect
-    border: 2px solid red;
-    position: absolute;
-    background-color: white;

tests/BaseTypes/Bounds.html

@@ -196 +196 @@
-
-    }
-    
+    
+    function test_Bounds_intersects(t){
+        t.plan(2);
+        
+        var bounds = new OpenLayers.Bounds(-20, -10, 20, 10);
+        
+        // intersects
+        var geometry = new OpenLayers.Geometry.Point(0, 0);
+        t.ok( bounds.intersects(geometry), "(" + bounds.toBBOX() + ") correctly intersects (" + geometry + ")");
+        
+        // no intersect
+        geometry = new OpenLayers.Geometry.Point(-50, 0);
+        t.ok( !bounds.intersects(geometry), "(" + bounds.toBBOX() + ") doesn't intersect (" + geometry + ")");
+    }
+    
-    function test_Bounds_containsBounds(t) {
-        t.plan( 35 );
-        containerBounds = new OpenLayers.Bounds(10,10,40,40);

tests/Control/SelectFeature.html

@@ -18 +18 @@
-    }
-    
-    function test_Control_SelectFeature_destroy(t) {
-1
+2
-        var map = new OpenLayers.Map("map");
-        var layer = new OpenLayers.Layer.Vector();
-        map.addLayer(layer);
-
-handler.destroy
+, {box: true}
+featureHandler.deactivate
-            t.ok(true,
-stroy calls destroy
+activate calls deactivate
-        }
+        control.boxHandler.deactivate = function() {
+            t.ok(true,
+                 "control.deactivate calls deactivate on box handler");
+        }
-// should nullify the layer property here
-        control.destroy();
-        
@@ -61 +65 @@
-        };
-        // mock up active control
-        var control = new OpenLayers.Control.SelectFeature(layer);
-h
+featureH
-            evt: {}
-        };
-        // mock up features
@@ -110 +114 @@
-        
-    }
-    
+    function test_Control_SelectFeature_box(t) {
+        t.plan(3);
+        var map = new OpenLayers.Map("map");
+        var layer = new OpenLayers.Layer.Vector();
+        map.addLayer(layer);
+        var control = new OpenLayers.Control.SelectFeature(layer, {'multiple': true, box: true });
+        var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(0,0));
+        var feature2 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,1));
+        var feature3 = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(-2,-2));
+        layer.addFeatures([feature,feature2,feature3]);
+        control.setMap(map);
+        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(-3, -3, -1, -1));
+        t.eq(layer.selectedFeatures.length, 3, "box around other features doesn't turn off already selected features.");        
+        
+        control.multipleSelect = function() {
+            return false;
+        };
+        control.selectBox(new OpenLayers.Bounds(-3, -3, -1, -1));
+        t.eq(layer.selectedFeatures.length, 1, "box around other features correctly turns off already selected features.")
+
+    }
+    
-    function test_Control_SelectFeature_activate(t) {
-2
+4
-        var map = new OpenLayers.Map("map");
-        var layer = new OpenLayers.Layer.Vector();
-        map.addLayer(layer);
-
+, {box: true}
-        map.addControl(control);
-h
+featureH
-             "feature handler is not active prior to activating control");
+        t.ok(!control.boxHandler.active,
+             "box handler is not active prior to activating control");
-        control.activate();
-h
+featureH
-             "feature handler is active after activating control");
+        t.ok(control.boxHandler.active,
+             "box handler is active after activating control");
-    }
-
-    function test_Control_SelectFeature_deactivate(t) {
-1
+2
-        var map = new OpenLayers.Map("map");
-        var layer = new OpenLayers.Layer.Vector();
-        map.addLayer(layer);
-
+, {box: true}
-        map.addControl(control);
-        
-        control.activate();
-h
+featureH
-            t.ok(true,
-                 "control.deactivate calls deactivate on feature handler");
-        }
+        control.boxHandler.deactivate = function() {
+            t.ok(true,
+                 "control.deactivate calls deactivate on box handler");
+        }
-        control.deactivate();
-    }
-

lib/OpenLayers/BaseTypes/Bounds.js

@@ -381 +381 @@
-    },
-    
-    /**
+     * APIMethod: intersects
+     *    Converts the current bounds into a LinearRing to check for
+     *    intersection with the given geometry
+     * 
+     * Parameters:
+     * geometry - {<OpenLayers.Geometry>}
+     * 
+     * Returns:
+     * {Boolean} The passed-in geometry object intersects this bounds.
+     */
+    intersects: function(geometry) {
+        return this.toGeometry().intersects(geometry);
+    },
+    
+    /**
-     * APIMethod: containsBounds
-     * 
-     * bounds - {<OpenLayers.Bounds>}

lib/OpenLayers/Control/SelectFeature.js

@@ -60 +60 @@
-    hover: false,
-    
-    /**
+     * APIProperty: box
+     * {Boolean} Allow feature selection by drawing a box.
+     */
+    box: false,
+    
+    /**
-     * APIProperty: onSelect 
-     * {Function} Optional function to be called when a feature is selected.
-     * The function should expect to be called with a feature.
@@ -88 +94 @@
-    
-    /**
-     * APIProperty: callbacks
-h
+featureH
-     */
-    callbacks: null,
-    
@@ -106 +112 @@
-    renderIntent: "select",
-
-    /**
-h
+featureH
-     * {<OpenLayers.Handler.Feature>}
-     */
-h
+featureH
-
-    /**
-     * Constructor: <OpenLayers.Control.SelectFeature>
@@ -127 +133 @@
-                                                  over: this.overFeature,
-                                                  out: this.outFeature
-                                                }, this.callbacks);
-h
-h
+featureH
+featureH
-                                                      this.callbacks,
-
+
+
+
+
+
+
+
+
+
+
+
-    },
-
-    /**
@@ -188 +204 @@
-     * {Boolean} Allow for multiple selected features.
-     */
-    multipleSelect: function() {
-h
+featureH
-    },
-    
-    /**
@@ -200 +216 @@
-     * {Boolean} Toggle the selected state of a feature.
-     */
-    toggleSelect: function() {
-h
+featureH
-    },
-
-    /**
@@ -279 +295 @@
-        this.layer.events.triggerEvent("featureunselected", {feature: feature});
-        this.onUnselect(feature);
-    },
+    
+    /**
+     * 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);
+            
+            // if multiple is false, first deselect currently selected features
+            if (!this.multipleSelect()) {
+                this.unselectAll();
+            }
+            
+            // because we're using a box, we consider we want multiple selection
+            var prevMultiple = this.multiple;
+            this.multiple = true;
+            for(var i = 0; i < this.layer.features.length; i++) {
+                var feature = this.layer.features[i];
+                if (bounds.intersects(feature.geometry)) {
+                    if (OpenLayers.Util.indexOf(this.layer.selectedFeatures, feature) == -1) {
+                        this.select(feature);
+                    }
+                }
+            }
+            this.multiple = prevMultiple;
+        }
+    },
+
-    /** 
-     * Method: setMap
-     * Set the map property for the control. 
@@ -288 +376 @@
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-
+
+
+
+
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-    },
-

examples/select-feature.html

@@ -41 +41 @@
-                        clickout: false, toggle: false,
-                        multiple: false, hover: false,
-                        toggleKey: "ctrlKey", // ctrl key removes from selection
-
+
+
-                    }
-                )
-            };