Ticket #800: mergeNewParams.2.patch

lib/OpenLayers/Layer/Grid.js

@@ -395 +395 @@
-    addTile:function(bounds, position) {
-        // 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();
-        }
-    },
-
-    
-    /**
-     * Method: shiftRow

lib/OpenLayers/Layer/HTTPRequest.js

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

lib/OpenLayers/Layer/MapServer/Untiled.js

@@ -245 +245 @@
-    },
-
-    /** 
-     * APIMethod: mergeNewParams
-     * Once HTTPRequest has updated new params, reload the image div
-     *
-     * Parameters:
-     * newParams - {Object} 
-     */
-    mergeNewParams:function(newParams) {
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 [newParams]);
-        //redraw
-        this.moveTo(null, true);
-    },
-    
-    /** 
-    * APIMethod: getFullRequestString
-    * combine the layer's url with its params and these newParams. 
-    *   

lib/OpenLayers/Layer/WMS/Untiled.js

@@ -272 +272 @@
-        var newArguments = [upperParams];
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 newArguments);
-        //redraw
-        this.moveTo(null, true);
-    },
-    
-    /** 

lib/OpenLayers/Layer/WFS.js

@@ -248 +248 @@
-        var newArguments = [upperParams];
-        OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this, 
-                                                                 newArguments);
-        //redraw
-        this.moveTo(null, true);
-    },
-
-    /**