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

[commits at geoext.org]

Author: bartvde
Date: 2011-10-25 15:03:07 +0200 (Tue, 25 Oct 2011)
New Revision: 2861

Modified:
   core/trunk/geoext/lib/GeoExt/widgets/WMSLegend.js
   core/trunk/geoext/tests/lib/GeoExt/widgets/WMSLegend.html
Log:
ignore TIME parameter for WMS GetLegendGraphic, p=geographika, r=me (closes #425)

Modified: core/trunk/geoext/lib/GeoExt/widgets/WMSLegend.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/WMSLegend.js	2011-10-25 12:18:06 UTC (rev 2860)
+++ core/trunk/geoext/lib/GeoExt/widgets/WMSLegend.js	2011-10-25 13:03:07 UTC (rev 2861)
@@ -138,7 +138,8 @@
                 STYLE: (styleName !== '') ? styleName: null,
                 STYLES: null,
                 SRS: null,
-                FORMAT: null
+                FORMAT: null,
+                TIME: null
             });
         }
         if (url.toLowerCase().indexOf("request=getlegendgraphic") != -1) {

Modified: core/trunk/geoext/tests/lib/GeoExt/widgets/WMSLegend.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/widgets/WMSLegend.html	2011-10-25 12:18:06 UTC (rev 2860)
+++ core/trunk/geoext/tests/lib/GeoExt/widgets/WMSLegend.html	2011-10-25 13:03:07 UTC (rev 2861)
@@ -192,7 +192,7 @@
         }
 
         function test_update(t) {
-            t.plan(9);
+            t.plan(10);
 
             // set up
 
@@ -280,6 +280,18 @@
                  "update adds random parameter to disable caching after forced redraw");
             layerRecord.set("styles", null);
 
+            // #7
+            // time parameter should be ignored
+            layerRecord.getLayer().mergeNewParams({
+                layers: "c",
+                _OLSALT: null,
+                time: "2004-10-12T13:55:20Z"
+            });
+            l.update();
+            expectedUrl = "/ows?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&EXCEPTIONS=application%2Fvnd.ogc.se_xml&FOO=bar&LAYER=c&SCALE=27683990.15625&FORMAT=image%2Fgif";
+            t.ok(OpenLayers.Util.isEquivalentUrl(l.getComponent("c").url, expectedUrl),
+                 "update updates component URL but ignored TIME parameter");
+
             // tear down
 
             l.destroy()