From b768574d72343c270f572225c9585d7d12222fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@camptocamp.com>
Date: Tue, 12 May 2009 06:18:00 +0000
Subject: [PATCH] when allOverlays is true a hidden layer can cause a WFS
 request, testsed by bartvde, r=tschaub (closes #2072)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@9370 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Map.js | 17 ++++++++++-------
 tests/Map.html        | 20 ++++++++++++++++----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 8019124b82..e8ae064108 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -1661,13 +1661,16 @@ OpenLayers.Map = OpenLayers.Class({
             var bounds = this.getExtent();
             
             //send the move call to the baselayer and all the overlays    
-            this.baseLayer.moveTo(bounds, zoomChanged, dragging);
-            if(dragging) {
-                this.baseLayer.events.triggerEvent("move");
-            } else {
-                this.baseLayer.events.triggerEvent("moveend",
-                    {"zoomChanged": zoomChanged}
-                );
+
+            if(this.baseLayer.visibility) {
+                this.baseLayer.moveTo(bounds, zoomChanged, dragging);
+                if(dragging) {
+                    this.baseLayer.events.triggerEvent("move");
+                } else {
+                    this.baseLayer.events.triggerEvent("moveend",
+                        {"zoomChanged": zoomChanged}
+                    );
+                }
             }
             
             bounds = this.baseLayer.getExtent();
diff --git a/tests/Map.html b/tests/Map.html
index b5273c245e..807907a6e2 100644
--- a/tests/Map.html
+++ b/tests/Map.html
@@ -1212,24 +1212,27 @@
     
     function test_allOverlays(t) {
         
-        t.plan(14);
-        
+        t.plan(16);
+
         var map = new OpenLayers.Map({
             div: "map", allOverlays: true
         });
         
-        var a = new OpenLayers.Layer.Vector("a");
+        var a = new OpenLayers.Layer.Vector("a", {visibility: true});
+
         var b = new OpenLayers.Layer.Image(
             "b",
             "http://earthtrends.wri.org/images/maps/4_m_citylights_lg.gif",
             new OpenLayers.Bounds(-180, -88.759, 180, 88.759),
             new OpenLayers.Size(580, 288)
         );
+
         var c = new OpenLayers.Layer.WMS(
             "c",
             "http://labs.metacarta.com/wms/vmap0",
             {layers: 'basic'}
         );
+
         var d = new OpenLayers.Layer.Vector("d");
         
         map.addLayers([a, b, c, d]);
@@ -1243,6 +1246,14 @@
         map.zoomToMaxExtent();
         t.eq(moveCount, 1, "map.moveTo moves the base layer only once");
         t.eq(map.getCenter().toString(), "lon=0,lat=0", "a map with all overlays can have a center");
+
+        a.setVisibility(false);
+        var moveend = 0;
+        a.events.on({"moveend": function() { moveend++; }}); 
+        map.zoomToMaxExtent();
+        t.eq(moveCount, 1, "map.moveTo does not move the base layer if it is invisible");
+        t.eq(moveend, 0, "map.moveTo does not trigger \"moveend\" in the layer if the layer is invisible");
+        a.setVisibility(true);
         
         // a, b, c, d
         t.eq(map.baseLayer.name, "a", "base layer set to first layer added");
@@ -1281,7 +1292,8 @@
         b.setVisibility(false);
         map.setLayerIndex(b, 0);
         t.eq(b.visibility, false, "changing layer order doesn't change visibility");
-        
+
+       
         map.destroy();
         
     }