HTTPRequest.mergeNewParams should now do redraw(true)

lib/OpenLayers/Layer/HTTPRequest.js

@@ -120,7 +120,7 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
      */
     mergeNewParams:function(newParams) {
         this.params = OpenLayers.Util.extend(this.params, newParams);
-        var ret = this.redraw();
+        var ret = OpenLayers.Layer.prototype.redraw.call(this, true);
         if(this.map != null) {
             this.map.events.triggerEvent("changelayer", {
                 layer: this,
@@ -144,7 +144,7 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
         if (force) {
             return this.mergeNewParams({"_olSalt": Math.random()});
         } else {
-            return OpenLayers.Layer.prototype.redraw.apply(this, []);
+            return OpenLayers.Layer.prototype.redraw.call(this);
         }
     },
     

tests/Layer/ArcGIS93Rest.html

@@ -155,7 +155,8 @@
         map.addLayer(layer);
         map.zoomToMaxExtent();
 
-        layer.redraw = function() {
+        var redraw = OpenLayers.Layer.prototype.redraw;
+        OpenLayers.Layer.prototype.redraw = function() {
             t.ok(true, "layer is redrawn after new params merged");
         }
 
@@ -167,6 +168,8 @@
         newParams.CHICKPEAS = 151;
 
         t.eq( layer.params.CHICKPEAS, "png", "mergeNewParams() makes clean copy of hashtable");
+
+        OpenLayers.Layer.prototype.redraw = redraw;
         map.destroy();
     }
 

tests/Layer/HTTPRequest.html

@@ -92,13 +92,14 @@
         t.eq( log[0].scope, scope, "mergeNewParams() executes changelayer listener with expected scope");
 
         newParams.chickpeas = 151;
-
         t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hash");
-        
+
-        layer.redraw = function() {
+        var redraw = OpenLayers.Layer.prototype.redraw;
-            t.ok(true, "layer.mergeNewParams calls layer.redraw");
+        OpenLayers.Layer.prototype.redraw = function(forceZoomChanged) {
-        }
+            t.eq(forceZoomChanged, true, 'mergeNewParams() sends true to Layer.redraw');
+        };
         layer.mergeNewParams();
+        OpenLayers.Layer.prototype.redraw = redraw;
     }
 
     function test_Layer_HTTPRequest_getFullRequestString (t) {

tests/Layer/KaMap.html

@@ -153,7 +153,9 @@
 
         map.addLayer(layer);
         map.zoomToMaxExtent();
-        layer.redraw = function() {
+
+        var redraw = OpenLayers.Layer.prototype.redraw;
+        OpenLayers.Layer.prototype.redraw = function() {
             t.ok(true, "layer is redrawn after new params merged");
         }
         
@@ -165,6 +167,8 @@
         newParams.chickpeas = 151;
 
         t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
+
+        OpenLayers.Layer.prototype.redraw = redraw;
         map.destroy();
     }
 

tests/Layer/MapGuide.html

@@ -132,7 +132,8 @@
         map.addLayer(layer);
         map.zoomToMaxExtent();
 
-        layer.redraw = function() {
+        var redraw = OpenLayers.Layer.prototype.redraw;
+        OpenLayers.Layer.prototype.redraw = function() {
             t.ok(true, "layer is redrawn after new params merged");
         }
 
@@ -144,6 +145,8 @@
         newParams.chickpeas = 151;
 
         t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
+
+        OpenLayers.Layer.prototype.redraw = redraw;
         map.destroy();
     }
 

tests/Layer/MapServer.html

@@ -136,7 +136,8 @@
         map.addLayer(layer);
         map.zoomToMaxExtent();
         
-        layer.redraw = function() {
+        var redraw = OpenLayers.Layer.prototype.redraw;
+        OpenLayers.Layer.prototype.redraw = function() {
             t.ok(true, "layer is redrawn after new params merged");
         }
         layer.mergeNewParams(newParams);
@@ -147,6 +148,8 @@
         newParams.chickpeas = 151;
 
         t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
+
+        OpenLayers.Layer.prototype.redraw = redraw;
         map.destroy();
     }
 

tests/Layer/WMS.html

@@ -195,7 +195,8 @@
         map.addLayer(layer);
         map.zoomToMaxExtent();
 
-        layer.redraw = function() {
+        var redraw = OpenLayers.Layer.prototype.redraw;
+        OpenLayers.Layer.prototype.redraw = function() {
             t.ok(true, "layer is redrawn after new params merged");
         }
 
@@ -207,6 +208,8 @@
         newParams.CHICKPEAS = 151;
 
         t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() makes clean copy of hashtable");
+
+        OpenLayers.Layer.prototype.redraw = redraw;
         map.destroy();
     }