[Commits] r1330 - in sandbox/camptocamp/geobretagne: lib/GeoExt/data tests/lib/GeoExt/data

[commits at geoext.org]

Author: bbinet
Date: 2009-08-19 11:32:05 +0200 (Wed, 19 Aug 2009)
New Revision: 1330

Modified:
   sandbox/camptocamp/geobretagne/lib/GeoExt/data/WMSCapabilitiesReader.js
   sandbox/camptocamp/geobretagne/tests/lib/GeoExt/data/WMSCapabilitiesReader.html
Log:
apply patch patch_151-r1329-A0.diff from geoext ticket 151: Add support for remembering queryable option when saving/loading a WMC

Modified: sandbox/camptocamp/geobretagne/lib/GeoExt/data/WMSCapabilitiesReader.js
===================================================================
--- sandbox/camptocamp/geobretagne/lib/GeoExt/data/WMSCapabilitiesReader.js	2009-08-19 09:05:32 UTC (rev 1329)
+++ sandbox/camptocamp/geobretagne/lib/GeoExt/data/WMSCapabilitiesReader.js	2009-08-19 09:32:05 UTC (rev 1330)
@@ -162,6 +162,8 @@
                         format: this.imageFormat(layer),
                         version: data.version
                     }, {
+                        queryable: layer.queryable != undefined ? 
+                            layer.queryable : undefined,
                         minScale: layer.minScale != undefined ? 
                             layer.minScale : undefined,
                         maxScale: layer.maxScale != undefined ? 

Modified: sandbox/camptocamp/geobretagne/tests/lib/GeoExt/data/WMSCapabilitiesReader.html
===================================================================
--- sandbox/camptocamp/geobretagne/tests/lib/GeoExt/data/WMSCapabilitiesReader.html	2009-08-19 09:05:32 UTC (rev 1329)
+++ sandbox/camptocamp/geobretagne/tests/lib/GeoExt/data/WMSCapabilitiesReader.html	2009-08-19 09:32:05 UTC (rev 1330)
@@ -33,7 +33,7 @@
                  'field values set from configuration are correct');
         }
         function test_read(t) {
-            t.plan(33);
+            t.plan(34);
 
             var reader = new GeoExt.data.WMSCapabilitiesReader();
 
@@ -88,7 +88,7 @@
             t.eq(record.get("identifiers").gcmd, "id_value", "[2] correct identifiers attribute");
             // cannot test "dimensions" until we have nested layers: see http://trac.openlayers.org/ticket/2144
 
-            //6 tests -- Testing the layer field
+            //7 tests -- Testing the layer field
             var layer = record.get("layer");
             t.eq(layer.CLASS_NAME, "OpenLayers.Layer.WMS", "[2] layer field is of type OpenLayers.Layer.WMS");
             t.eq(layer.url, "http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&", "[2] layer field has correct URL");
@@ -96,6 +96,7 @@
             t.eq(layer.name, "Manhattan (NY) roads","[2] layer field has correct name");
             t.eq(typeof(layer.minScale), "number","[2] layer minScale has been set");
             t.eq(typeof(layer.maxScale), "number","[2] layer maxScale has been set");
+            t.eq(layer.queryable, true, "[2] layer field has correct queryable attribute");
             
             // 3 tests -- attribution markup
             var attribution = layer.attribution;