Ticket #716: layerswitcher.patch

examples/layerswitcher.html

@@ -17 +17 @@
-
-            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",
-                "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
@@ -42 +42 @@
-    <h1>OpenLayers Example</h1>
-    <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>

lib/OpenLayers/Control/LayerSwitcher.js

@@ -187 +187 @@
-        this.clearLayersArray("data");
-        
-        var containsOverlays = false;
+        var containsBaseLayers = false;
-        
-        var layers = this.map.layers.slice();
-        if (!this.ascending) { layers.reverse(); }
@@ -194 +195 @@
-            var layer = layers[i];
-            var baseLayer = layer.isBaseLayer;
-
-baseLayer || 
+
-
-                if (!baseLayer) {
-                    containsOverlays = true;
-
+
+
+
-
-                // only check a baselayer if it is *the* baselayer, check data
-                //  layers if they are visible
@@ -258 +261 @@
-
-        // if no overlays, dont display the overlay label
-        this.dataLbl.style.display = (containsOverlays) ? "" : "none";        
+        
+        // if no overlays, dont display the overlay label
+        this.baseLbl.style.display = (containsBaseLayers) ? "" : "none";        
-
-        return this.div;
-    },
@@ -428 +434 @@
-        this.layersDiv.style.height = "100%";
-
-
-var 
-
-
-
-
+this.
+this.
+this.
+this.
+this.
-        
-        this.baseLayersDiv = document.createElement("div");
-        this.baseLayersDiv.style.paddingLeft = "10px";
@@ -451 +457 @@
-        this.dataLayersDiv.style.paddingLeft = "10px";
-
-        if (this.ascending) {
-
+this.
-            this.layersDiv.appendChild(this.baseLayersDiv);
-            this.layersDiv.appendChild(this.dataLbl);
-            this.layersDiv.appendChild(this.dataLayersDiv);
-        } else {
-            this.layersDiv.appendChild(this.dataLbl);
-            this.layersDiv.appendChild(this.dataLayersDiv);
-
+this.
-            this.layersDiv.appendChild(this.baseLayersDiv);
-        }    
- 

tests/Control/test_LayerSwitcher.html

@@ -115 +115 @@
-        t.ok(control2.div.childNodes[1].childNodes[2].innerHTML.match("Base Layer"), "Base Layers last in LayerSwitcher with ascending false");
-        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");
+    }
+
+
-  // -->
-  </script>
-</head>