From ae55f1a70c39d015df388e6b40b31f0d52017cf8 Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Mon, 23 Jan 2012 14:30:36 +0100
Subject: [PATCH] Adding boxselectionstart and boxselectionend events.

Whitespace fixed from patch, and removed docs for beforefeatureselected and featureselected events because they are fired on the layer, not the control.
p=mosesonline, r=me (closes http://trac.osgeo.org/openlayers/ticket/3538)
---
 lib/OpenLayers/Control/SelectFeature.js |  4 +++
 tests/Control/SelectFeature.html        | 43 ++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/lib/OpenLayers/Control/SelectFeature.js b/lib/OpenLayers/Control/SelectFeature.js
index 3c47929feb..ab6ac484ab 100644
--- a/lib/OpenLayers/Control/SelectFeature.js
+++ b/lib/OpenLayers/Control/SelectFeature.js
@@ -26,6 +26,8 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
      *  - *beforefeaturehighlighted* Triggered before a feature is highlighted
      *  - *featurehighlighted* Triggered when a feature is highlighted
      *  - *featureunhighlighted* Triggered when a feature is unhighlighted
+     *  - *boxselectionstart* Triggered before box selection starts
+     *  - *boxselectionend* Triggered after box selection ends
      */
     
     /**
@@ -556,6 +558,7 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
             var prevMultiple = this.multiple;
             this.multiple = true;
             var layers = this.layers || [this.layer];
+            this.events.triggerEvent("boxselectionstart", {layers: layers}); 
             var layer;
             for(var l=0; l<layers.length; ++l) {
                 layer = layers[l];
@@ -577,6 +580,7 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
                 }
             }
             this.multiple = prevMultiple;
+            this.events.triggerEvent("boxselectionend", {layers: layers}); 
         }
     },
 
diff --git a/tests/Control/SelectFeature.html b/tests/Control/SelectFeature.html
index e5dcb39684..68e3031165 100644
--- a/tests/Control/SelectFeature.html
+++ b/tests/Control/SelectFeature.html
@@ -173,6 +173,47 @@
 
     }
 
+
+    function test_selectBox_events(t){
+        t.plan(8);
+        var map = new OpenLayers.Map("map");
+        var layer1 = new OpenLayers.Layer.Vector();
+        map.addLayer(layer1);
+        map.setBaseLayer(layer1);
+        var layer2 = new OpenLayers.Layer.Vector();
+        map.addLayer(layer2);
+        map.setCenter(new OpenLayers.LonLat(1,1));
+        var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,1));
+        layer1.addFeatures([feature]);
+        var control = new OpenLayers.Control.SelectFeature(layer1);
+        control.setMap(map);
+        map.getLonLatFromPixel = function(arg) {
+            return new OpenLayers.LonLat(arg.x, arg.y);
+        }
+        control.activate();
+        var firesBoxselectionstart = false;
+        var beforeSelectingNumberOfFeatures = -1;
+        var firesBoxselectionend = false;
+        var afterSelectingNumberOfFeatures = -1;
+        control.events.register("boxselectionstart",null, function(e){
+            firesBoxselectionstart=true;
+            t.eq(e.layers.length,1,"right number of layers in event boxselectionstart");
+            t.eq(layer1.id, e.layers[0].id,"correct layer in event boxselectionstart");
+            beforeSelectingNumberOfFeatures = e.layers[0].selectedFeatures.length;
+        });
+        control.events.register("boxselectionend",null, function(e){
+            firesBoxselectionend=true;
+            t.eq(e.layers.length,1,"right number of layers in event boxselectionend");
+            t.eq(layer1.id, e.layers[0].id,"correct layer in event boxselectionend");
+            afterSelectingNumberOfFeatures = e.layers[0].selectedFeatures.length;
+        });
+        var bounds = new OpenLayers.Bounds(-1, -1, 2, 2);
+        control.selectBox(bounds);
+        t.ok(firesBoxselectionstart,"selectBox fires boxselectionstart event");
+        t.eq(beforeSelectingNumberOfFeatures,0,"boxselectionstart fires before selection of feature");
+        t.ok(firesBoxselectionend,"selectBox fires boxselectionend event");
+        t.eq(afterSelectingNumberOfFeatures,1,"boxselectionend fires after feature selected");
+    }
     function test_Control_SelectFeature_activate(t) {
         t.plan(4);
         var map = new OpenLayers.Map("map");
@@ -480,7 +521,7 @@
         t.eq(feature.renderIntent, "default",
              "feature drawn with expected render intent after \"mouseout\"");
     }
-
+    
     function test_setLayer(t) {
         t.plan(5);
         var map = new OpenLayers.Map("map");