ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HTTPRequest.mergeNewParams should now do redraw(true)

Browse Source
This commit is contained in:
Éric Lemoine
2011-12-22 14:21:07 +01:00
parent 289d9d371d
commit ff04517232
7 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/OpenLayers/Layer/HTTPRequest.js
View File

@@ -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);
}
},

5
tests/Layer/ArcGIS93Rest.html
View File

@@ -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();
}

11
tests/Layer/HTTPRequest.html
View File

@@ -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) {

6
tests/Layer/KaMap.html
View File

@@ -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();
}

5
tests/Layer/MapGuide.html
View File

@@ -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();
}

5
tests/Layer/MapServer.html
View File

@@ -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();
}

5
tests/Layer/WMS.html
View File

@@ -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();
}