revert changes to layer mergeNewParams tests (ff045172)
This commit is contained in:
@@ -155,8 +155,7 @@
|
||||
map.addLayer(layer);
|
||||
map.zoomToMaxExtent();
|
||||
|
||||
var redraw = OpenLayers.Layer.prototype.redraw;
|
||||
OpenLayers.Layer.prototype.redraw = function() {
|
||||
layer.redraw = function() {
|
||||
t.ok(true, "layer is redrawn after new params merged");
|
||||
}
|
||||
|
||||
@@ -168,8 +167,6 @@
|
||||
newParams.CHICKPEAS = 151;
|
||||
|
||||
t.eq( layer.params.CHICKPEAS, "png", "mergeNewParams() makes clean copy of hashtable");
|
||||
|
||||
OpenLayers.Layer.prototype.redraw = redraw;
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
|
||||
@@ -92,14 +92,13 @@
|
||||
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");
|
||||
|
||||
var redraw = OpenLayers.Layer.prototype.redraw;
|
||||
OpenLayers.Layer.prototype.redraw = function() {
|
||||
t.eq(this.resolution, null, 'mergeNewParams sets layer resolution to null, causing redraw to call moveTo with zoomChanged set to true');
|
||||
};
|
||||
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();
|
||||
OpenLayers.Layer.prototype.redraw = redraw;
|
||||
}
|
||||
|
||||
function test_Layer_HTTPRequest_getFullRequestString (t) {
|
||||
|
||||
@@ -153,9 +153,7 @@
|
||||
|
||||
map.addLayer(layer);
|
||||
map.zoomToMaxExtent();
|
||||
|
||||
var redraw = OpenLayers.Layer.prototype.redraw;
|
||||
OpenLayers.Layer.prototype.redraw = function() {
|
||||
layer.redraw = function() {
|
||||
t.ok(true, "layer is redrawn after new params merged");
|
||||
}
|
||||
|
||||
@@ -167,8 +165,6 @@
|
||||
newParams.chickpeas = 151;
|
||||
|
||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
||||
|
||||
OpenLayers.Layer.prototype.redraw = redraw;
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
|
||||
@@ -132,8 +132,7 @@
|
||||
map.addLayer(layer);
|
||||
map.zoomToMaxExtent();
|
||||
|
||||
var redraw = OpenLayers.Layer.prototype.redraw;
|
||||
OpenLayers.Layer.prototype.redraw = function() {
|
||||
layer.redraw = function() {
|
||||
t.ok(true, "layer is redrawn after new params merged");
|
||||
}
|
||||
|
||||
@@ -145,8 +144,6 @@
|
||||
newParams.chickpeas = 151;
|
||||
|
||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
||||
|
||||
OpenLayers.Layer.prototype.redraw = redraw;
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
|
||||
@@ -136,8 +136,7 @@
|
||||
map.addLayer(layer);
|
||||
map.zoomToMaxExtent();
|
||||
|
||||
var redraw = OpenLayers.Layer.prototype.redraw;
|
||||
OpenLayers.Layer.prototype.redraw = function() {
|
||||
layer.redraw = function() {
|
||||
t.ok(true, "layer is redrawn after new params merged");
|
||||
}
|
||||
layer.mergeNewParams(newParams);
|
||||
@@ -148,8 +147,6 @@
|
||||
newParams.chickpeas = 151;
|
||||
|
||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
||||
|
||||
OpenLayers.Layer.prototype.redraw = redraw;
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
|
||||
@@ -195,8 +195,7 @@
|
||||
map.addLayer(layer);
|
||||
map.zoomToMaxExtent();
|
||||
|
||||
var redraw = OpenLayers.Layer.prototype.redraw;
|
||||
OpenLayers.Layer.prototype.redraw = function() {
|
||||
layer.redraw = function() {
|
||||
t.ok(true, "layer is redrawn after new params merged");
|
||||
}
|
||||
|
||||
@@ -208,8 +207,6 @@
|
||||
newParams.CHICKPEAS = 151;
|
||||
|
||||
t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
||||
|
||||
OpenLayers.Layer.prototype.redraw = redraw;
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user