Changeset 3584

Timestamp:

07/05/07 10:24:15 (1 year ago)

Author:

euzuro

Message:

fix for #800 - the mergeNewParams function is now simplified. the only time it need be overridden now is in WMS, which mandates that all parameters should be uppercased. thanks for the review and the added test, tim.

Files:

• trunk/openlayers/lib/OpenLayers/Layer/Grid.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/HTTPRequest.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/WFS.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_HTTPRequest.html (modified) (2 diffs)

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

@@ -396 +396 @@
-        // Should be implemented by subclasses
-    },
-
-    /**
-     * APIMethod: mergeNewParams
-     * Once params have been changed, we will need to re-init our tiles
-     *
-     * Parameters:
-     * newParams - {Object} Hashtable of new params to use
-     */
-    mergeNewParams:function(newArguments) {
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this,
-                                                                [newArguments]);
-
-        if (this.map != null) {
-            this._initTiles();
-        }
-    },
-
-    
-    /**

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

@@ -116 +116 @@
-    mergeNewParams:function(newParams) {
-        this.params = OpenLayers.Util.extend(this.params, newParams);
+        this.redraw();
-    },
-    

trunk/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js

@@ -244 +244 @@
-        this.redraw();
-    },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    /** 
-    * APIMethod: getFullRequestString

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

@@ -249 +249 @@
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 newArguments);
-        //redraw
-        this.moveTo(null, true);
-    },
-

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

@@ -260 +260 @@
-        this.redraw();
-    },
-
-    /**
-     * APIMethod: mergeNewParams
-     * Once HTTPRequest has updated new params, reload the image div
-     *
-     * Parameters:
-     * newParams - {Object} 
-     */
-    mergeNewParams:function(newParams) {
-        var upperParams = OpenLayers.Util.upperCaseObject(newParams);
-        var newArguments = [upperParams];
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 newArguments);
-        this.redraw();
-    },
-    
-    /** 

trunk/openlayers/tests/Layer/test_HTTPRequest.html

@@ -66 +66 @@
-
-    function test_05_Layer_HTTPRequest_mergeNewParams (t) {
-3
+4
-
-        layer = new OpenLayers.Layer.HTTPRequest(name, url, params, options);
@@ -81 +81 @@
-
-        t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hash");
+        
+        layer.redraw = function() {
+            t.ok(true, "layer.mergeNewParams calls layer.redraw");
+        }
+        layer.mergeNewParams();
-
-