Changeset 3853

Timestamp:

08/04/07 08:14:32 (1 year ago)

Author:

crschmidt

Message:

Commiting fix for #716, "Make LayerSwitcher support displayInLayerSwitcher
for Base Layers", reviewed by Erik, tested by tschaub.

Files:

• trunk/openlayers/examples/layerswitcher.html (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Control/LayerSwitcher.js (modified) (6 diffs)
• trunk/openlayers/tests/Control/test_LayerSwitcher.html (modified) (1 diff)

trunk/openlayers/examples/layerswitcher.html

@@ -18 +18 @@
-            var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0",
-
+, {'displayInLayerSwitcher':false}
-
-            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
-                "http://wms.jpl.nasa.gov/wms.cgi", 
-
+, {'isBaseLayer': false}
-
-            var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo",
@@ -43 +43 @@
-    <div id="layerswitcher" style="float:right; width: 20em;"></div>
-    <div id="map"></div>
+    <div id="docs">
+      <p>This demonstrates use of the LayerSwitcher outside the map div. It also shows use 
+         of the displayInLayerSwitcher option on the Layer to cause it to not display in the
+         LayerSwitcher.</p>
+   </div>      
-  </body>
-</html>

trunk/openlayers/lib/OpenLayers/Control/LayerSwitcher.js

@@ -186 +186 @@
-        
-        var containsOverlays = false;
+        var containsBaseLayers = false;
-        
-        var layers = this.map.layers.slice();
@@ -193 +194 @@
-            var baseLayer = layer.isBaseLayer;
-
-
-
-
+
+
+
+
+
-                    containsOverlays = true;
-
+    
-
-                // only check a baselayer if it is *the* baselayer, check data
@@ -257 +260 @@
-        // if no overlays, dont display the overlay label
-        this.dataLbl.style.display = (containsOverlays) ? "" : "none";        
+        
+        // if no baselayers, dont display the baselayer label
+        this.baseLbl.style.display = (containsBaseLayers) ? "" : "none";        
-
-        return this.div;
@@ -427 +433 @@
-
-
-var 
-
-
-
-
+this.
+this.
+this.
+this.
+this.
-        
-        this.baseLayersDiv = document.createElement("div");
@@ -450 +456 @@
-
-        if (this.ascending) {
-
+this.
-            this.layersDiv.appendChild(this.baseLayersDiv);
-            this.layersDiv.appendChild(this.dataLbl);
@@ -457 +463 @@
-            this.layersDiv.appendChild(this.dataLbl);
-            this.layersDiv.appendChild(this.dataLayersDiv);
-
+this.
-            this.layersDiv.appendChild(this.baseLayersDiv);
-        }    

trunk/openlayers/tests/Control/test_LayerSwitcher.html

@@ -116 +116 @@
-        t.ok(control2.div.childNodes[1].childNodes[0].innerHTML.match("Overlays"), "Base Layers last in LayerSwitcher with ascending false");
-    }
+    
+    function test_Control_LayerSwitcher_displayInLayerSwitcher (t) {
+
+        t.plan( 2 );
+
+        map = new OpenLayers.Map('map');
+        var layer = new OpenLayers.Layer.WMS("WMS", 
+            "http://octo.metacarta.com/cgi-bin/mapserv?",
+            {map: "/mapdata/vmap_wms.map", layers: "basic"}, {'displayInLayerSwitcher': false});
+        map.addLayer(layer);
+
+        control = new OpenLayers.Control.LayerSwitcher();
+        map.addControl(control);
+        t.eq(control.div.childNodes[1].childNodes[0].style.display, "none" , "Base layer display off when no visble base layer");
+        
+        map = new OpenLayers.Map('map');
+        var layer = new OpenLayers.Layer.WMS("WMS", 
+            "http://octo.metacarta.com/cgi-bin/mapserv?",
+            {map: "/mapdata/vmap_wms.map", layers: "basic"});
+        map.addLayer(layer);
+
+        control = new OpenLayers.Control.LayerSwitcher();
+        map.addControl(control);
+        t.eq(control.div.childNodes[1].childNodes[0].style.display, "" , "Base layer display on when visble base layer");
+    }
-
-