From 361ca8af9501f65094704a8dc69d2f81ce09d779 Mon Sep 17 00:00:00 2001
From: bartvde <bartvde@osgis.nl>
Date: Sat, 5 Mar 2011 23:34:44 +0000
Subject: [PATCH] fix up the case in which a vector layer needs to be
 reprojected and the map is not yet centered for the BBOX Strategy, thanks
 tschaub for the catch, p=vmische, r=me (closes #3142)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@11617 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Strategy/BBOX.js | 3 ++-
 tests/Strategy/BBOX.html        | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/OpenLayers/Strategy/BBOX.js b/lib/OpenLayers/Strategy/BBOX.js
index 36354ccb12..8ae78958aa 100644
--- a/lib/OpenLayers/Strategy/BBOX.js
+++ b/lib/OpenLayers/Strategy/BBOX.js
@@ -153,7 +153,8 @@ OpenLayers.Strategy.BBOX = OpenLayers.Class(OpenLayers.Strategy, {
             return null;
         }
         var bounds = this.layer.map.getExtent();
-        if(!this.layer.projection.equals(this.layer.map.getProjectionObject())) {
+        if(bounds && !this.layer.projection.equals(
+                this.layer.map.getProjectionObject())) {
             bounds = bounds.clone().transform(
                 this.layer.map.getProjectionObject(), this.layer.projection
             );
diff --git a/tests/Strategy/BBOX.html b/tests/Strategy/BBOX.html
index 60e190d2a4..746c915a33 100644
--- a/tests/Strategy/BBOX.html
+++ b/tests/Strategy/BBOX.html
@@ -284,8 +284,17 @@
             strategies: [strategy]
         });
 
+        // Make sure to test the case of a vector layer needing to be 
+        // reprojected while the map is not yet centered
+        var layerReproject = new OpenLayers.Layer.Vector(null, {
+            protocol: new OpenLayers.Protocol(),
+            strategies: [new OpenLayers.Strategy.BBOX()],
+            projection: 'EPSG:900913'
+        });
+
         var map = new OpenLayers.Map("map");
         map.addLayer(dummy);
+        map.addLayer(layerReproject);
         map.setCenter(new OpenLayers.LonLat(0, 0));
         map.addLayer(layer);