From ff045172320eb74808d7c3b3c6e1d80dfaa9c761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 22 Dec 2011 14:21:07 +0100 Subject: [PATCH] HTTPRequest.mergeNewParams should now do redraw(true) --- lib/OpenLayers/Layer/HTTPRequest.js | 4 ++-- tests/Layer/ArcGIS93Rest.html | 5 ++++- tests/Layer/HTTPRequest.html | 11 ++++++----- tests/Layer/KaMap.html | 6 +++++- tests/Layer/MapGuide.html | 5 ++++- tests/Layer/MapServer.html | 5 ++++- tests/Layer/WMS.html | 5 ++++- 7 files changed, 29 insertions(+), 12 deletions(-) diff --git a/lib/OpenLayers/Layer/HTTPRequest.js b/lib/OpenLayers/Layer/HTTPRequest.js index ddf3d51073..3841c9f73d 100644 --- a/lib/OpenLayers/Layer/HTTPRequest.js +++ b/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); } }, diff --git a/tests/Layer/ArcGIS93Rest.html b/tests/Layer/ArcGIS93Rest.html index 4f1a4c618d..7c815b773e 100644 --- a/tests/Layer/ArcGIS93Rest.html +++ b/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(); } diff --git a/tests/Layer/HTTPRequest.html b/tests/Layer/HTTPRequest.html index 02311564f1..e753586dd0 100644 --- a/tests/Layer/HTTPRequest.html +++ b/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() { - t.ok(true, "layer.mergeNewParams calls layer.redraw"); - } + + var redraw = OpenLayers.Layer.prototype.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) { diff --git a/tests/Layer/KaMap.html b/tests/Layer/KaMap.html index b22917fda0..b2c22cf650 100644 --- a/tests/Layer/KaMap.html +++ b/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(); } diff --git a/tests/Layer/MapGuide.html b/tests/Layer/MapGuide.html index b1eb386c27..f71218071c 100644 --- a/tests/Layer/MapGuide.html +++ b/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(); } diff --git a/tests/Layer/MapServer.html b/tests/Layer/MapServer.html index 16e59156e3..ff8cdf4e53 100644 --- a/tests/Layer/MapServer.html +++ b/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(); } diff --git a/tests/Layer/WMS.html b/tests/Layer/WMS.html index a07b36c1d9..bb04560c88 100644 --- a/tests/Layer/WMS.html +++ b/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(); }