[Commits] r1890 - in core/trunk/geoext: lib/GeoExt/widgets tests/lib/GeoExt/widgets

[commits at geoext.org]

Author: ahocevar
Date: 2010-02-11 23:32:29 +0100 (Thu, 11 Feb 2010)
New Revision: 1890

Modified:
   core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js
   core/trunk/geoext/tests/lib/GeoExt/widgets/LegendPanel.html
Log:
make sure that baseLayers show up in legend. r=tschaub (closes #173)

Modified: core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js	2010-02-11 20:44:22 UTC (rev 1889)
+++ core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js	2010-02-11 22:32:29 UTC (rev 1890)
@@ -144,7 +144,7 @@
         var layer = record.get('layer');
         var legend = this.items ? this.getComponent(this.getIdForLayer(layer)) : null;
         if (legend) {
-            legend.setVisible(layer.getVisibility() && layer.inRange &&
+            legend.setVisible(layer.getVisibility() && layer.calculateInRange() &&
                 layer.displayInLayerSwitcher && !record.get('hideInLegend'));
             legend.update();
         }
@@ -230,7 +230,7 @@
                     xtype: types[0],
                     id: this.getIdForLayer(layer),
                     layerRecord: record,
-                    hidden: !(layer.getVisibility() && layer.inRange)
+                    hidden: !(layer.getVisibility() && layer.calculateInRange())
                 });
             }
         }

Modified: core/trunk/geoext/tests/lib/GeoExt/widgets/LegendPanel.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/widgets/LegendPanel.html	2010-02-11 20:44:22 UTC (rev 1889)
+++ core/trunk/geoext/tests/lib/GeoExt/widgets/LegendPanel.html	2010-02-11 22:32:29 UTC (rev 1890)
@@ -8,7 +8,7 @@
 
     <script type="text/javascript">
 
-        function loadMapPanel() {
+        function loadMapPanel(mapOptions) {
             mapPanel = new GeoExt.MapPanel({
                 // panel options
                 id: "map-panel",
@@ -17,6 +17,7 @@
                 height: 400,
                 width: 600,
                 // map panel-specific options
+                map: mapOptions,
                 layers: [
                     new OpenLayers.Layer.WMS("test", '/ows', {layers: 'a'})
                 ],
@@ -249,15 +250,19 @@
         }
 
         function test_scaledependency(t) {
-            t.plan(1);
-            var mapPanel = loadMapPanel();
-            mapPanel.map.layers[0].inRange = false;
+            t.plan(2);
+            var mapPanel = loadMapPanel({allOverlays: false});
+            mapPanel.map.addLayer(new OpenLayers.Layer.WMS("foo", "http://dummy",
+                {layers: "dummy"},
+                {minResolution: 3, maxResolution: 4, isBaseLayer: false}));
             var lp  = new GeoExt.LegendPanel({
                 renderTo: 'legendpanel'});
             lp.render();
 
-            var id = lp.getIdForLayer(mapPanel.layers.getAt(0).get('layer'));
-            t.eq(lp.getComponent(id).hidden, true, "Layer has been hidden in legend because it is not in scale");
+            var id0 = lp.getIdForLayer(mapPanel.layers.getAt(0).get('layer'));
+            var id1 = lp.getIdForLayer(mapPanel.layers.getAt(1).get('layer'));
+            t.eq(lp.getComponent(id0).hidden, false, "Base layer is visible");
+            t.eq(lp.getComponent(id1).hidden, true, "Layer has been hidden in legend because it is not in scale");
 
             lp.destroy();
             mapPanel.destroy();