Changeset 2237

Timestamp:

02/17/07 10:00:05 (2 years ago)

Author:

crschmidt

Message:

the mergeNewParams function does not reinitialize the tiles for layers
other than WMS. It should do this for any Grid layer. Ticket #496 includes
a patch for this: it adds a mergeNewParams call at the Layer.Grid level,
(subclassing Layer.HTTPRequest) which reinits the tile grid. This commit
also includes tests for this functionality. Since testing directly
on the Grid layer doesn't work (it's meant to be subclassed), we need to
instead pick a second layer to test -- in this case, ka-Map. Thanks to
Bill Woodall for the patch.

Files:

• trunk/openlayers/lib/OpenLayers/Layer/Grid.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/WMS.js (modified) (1 diff)
• trunk/openlayers/tests/test_Layer_KaMap.html (modified) (1 diff)
• trunk/openlayers/tests/test_Layer_WMS.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Layer/Grid.js

@@ -352 +352 @@
-    },
-
+    /**
+     * Once params have been changed, we will need to re-init our tiles
+     *
+     * @param {Object} newParams Hashtable of new params to use
+     */
+    mergeNewParams:function(newArguments) {
+        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this,
+                                                                [newArguments]);
+
+        if (this.map != null) {
+            this._initTiles();
+        }
+    },
+
-    
-    /** go through and remove all tiles from the grid, calling

trunk/openlayers/lib/OpenLayers/Layer/WMS.js

@@ -127 +127 @@
-        OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this, 
-                                                             newArguments);
-
-        if (this.map != null) {
-            this._initTiles();
-        }
-    },
-

trunk/openlayers/tests/test_Layer_KaMap.html

@@ -102 +102 @@
-        t.eq( zoom, 2, "getZoomForExtent() returns correct value");
-    }   
+    
+    function test_06_Layer_kaMap_mergeNewParams (t) {
+        t.plan( 5 );
+
+        var map = new OpenLayers.Map("map");
+        var url = "http://octo.metacarta.com/cgi-bin/mapserv";
+        layer = new OpenLayers.Layer.KaMap(name, url, params);
+        
+        var newParams = { layers: 'sooper', 
+                          chickpeas: 'image/png'};
+
+        map.addLayer(layer);
+        map.zoomToMaxExtent();
+        t.ok( !layer.grid[0][0].url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
+
+        layer.mergeNewParams(newParams);
+        
+        t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
+        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
+        t.ok( layer.grid[0][0].url.match("chickpeas"), "CHICKPEAS is in URL of first tile in grid" );
+
+        newParams.chickpeas = 151;
+
+        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
+    }
-
-

trunk/openlayers/tests/test_Layer_WMS.html

@@ -121 +121 @@
-
-    function test_06_Layer_WMS_mergeNewParams (t) {
-
-
+
+
+
-        var url = "http://octo.metacarta.com/cgi-bin/mapserv";
-        layer = new OpenLayers.Layer.WMS(name, url, params);
@@ -129 +130 @@
-                          chickpeas: 'image/png'};
-
+        map.addLayer(layer);
+        map.zoomToMaxExtent();
+        t.ok( !layer.grid[0][0].url.match("CHICKPEAS"), "CHICKPEAS is not in URL of first tile in grid" );
+
-        layer.mergeNewParams(newParams);
-        
-        t.eq( layer.params.LAYERS, "sooper", "mergeNewParams() overwrites well");
-        t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() adds well");
+        t.ok( layer.grid[0][0].url.match("CHICKPEAS"), "CHICKPEAS is in URL of first tile in grid" );
-
-        newParams.CHICKPEAS = 151;