patch for #910 - removing extraneous moveTo() from tile/image.js
git-svn-id: http://svn.openlayers.org/trunk/openlayers@3928 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -38,7 +38,7 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
|
|||||||
|
|
||||||
/** TBD 3.0 - reorder the parameters to the init function to remove
|
/** TBD 3.0 - reorder the parameters to the init function to remove
|
||||||
* URL. the getUrl() function on the layer gets called on
|
* URL. the getUrl() function on the layer gets called on
|
||||||
* each draw() and moveTo(), so no need to specify it here.
|
* each draw(), so no need to specify it here.
|
||||||
*
|
*
|
||||||
* Constructor: OpenLayers.Tile.Image
|
* Constructor: OpenLayers.Tile.Image
|
||||||
* Constructor for a new <OpenLayers.Tile.Image> instance.
|
* Constructor for a new <OpenLayers.Tile.Image> instance.
|
||||||
@@ -139,23 +139,6 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
|
||||||
* Method: moveTo
|
|
||||||
* Reposition the tile.
|
|
||||||
*
|
|
||||||
* Parameters:
|
|
||||||
* bounds - {<OpenLayers.Bounds>}
|
|
||||||
* position - {<OpenLayers.Pixel>}
|
|
||||||
* redraw - {Boolean} Call draw method on tile after moving? Default is true
|
|
||||||
*/
|
|
||||||
moveTo: function (bounds, position, redraw) {
|
|
||||||
if (this.layer != this.layer.map.baseLayer && this.layer.reproject) {
|
|
||||||
bounds = this.getBoundsFromBaseLayer(position);
|
|
||||||
}
|
|
||||||
this.url = this.layer.getURL(bounds);
|
|
||||||
OpenLayers.Tile.prototype.moveTo.apply(this, arguments);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method: initImgDiv
|
* Method: initImgDiv
|
||||||
* Creates the imgDiv property on the tile.
|
* Creates the imgDiv property on the tile.
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function test_06_Layer_kaMap_mergeNewParams (t) {
|
function test_06_Layer_kaMap_mergeNewParams (t) {
|
||||||
t.plan( 5 );
|
t.plan( 4 );
|
||||||
|
|
||||||
var map = new OpenLayers.Map("map");
|
var map = new OpenLayers.Map("map");
|
||||||
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
|
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
|
||||||
@@ -114,13 +114,14 @@
|
|||||||
|
|
||||||
map.addLayer(layer);
|
map.addLayer(layer);
|
||||||
map.zoomToMaxExtent();
|
map.zoomToMaxExtent();
|
||||||
t.ok( !layer.grid[0][0].url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
|
layer.redraw = function() {
|
||||||
|
t.ok(true, "layer is redrawn after new params merged");
|
||||||
|
}
|
||||||
|
|
||||||
layer.mergeNewParams(newParams);
|
layer.mergeNewParams(newParams);
|
||||||
|
|
||||||
t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
|
t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
|
||||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
|
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
|
||||||
t.ok( layer.grid[0][0].url.match("chickpeas"), "CHICKPEAS is in URL of first tile in grid" );
|
|
||||||
|
|
||||||
newParams.chickpeas = 151;
|
newParams.chickpeas = 151;
|
||||||
|
|
||||||
|
|||||||
@@ -136,12 +136,14 @@
|
|||||||
map.addLayer(layer);
|
map.addLayer(layer);
|
||||||
map.zoomToMaxExtent();
|
map.zoomToMaxExtent();
|
||||||
|
|
||||||
|
layer.redraw = function() {
|
||||||
|
t.ok(true, "layer is redrawn after new params merged");
|
||||||
|
}
|
||||||
layer.mergeNewParams(newParams);
|
layer.mergeNewParams(newParams);
|
||||||
|
|
||||||
t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
|
t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
|
||||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
|
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
|
||||||
t.ok( layer.grid[0][0].url.match("chickpeas"), "chickpeas is in URL of first tile in grid" );
|
|
||||||
|
|
||||||
newParams.chickpeas = 151;
|
newParams.chickpeas = 151;
|
||||||
|
|
||||||
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
||||||
|
|||||||
@@ -160,12 +160,15 @@
|
|||||||
map.addLayer(layer);
|
map.addLayer(layer);
|
||||||
map.zoomToMaxExtent();
|
map.zoomToMaxExtent();
|
||||||
|
|
||||||
|
layer.redraw = function() {
|
||||||
|
t.ok(true, "layer is redrawn after new params merged");
|
||||||
|
}
|
||||||
|
|
||||||
layer.mergeNewParams(newParams);
|
layer.mergeNewParams(newParams);
|
||||||
|
|
||||||
t.eq( layer.params.LAYERS, "sooper", "mergeNewParams() overwrites well");
|
t.eq( layer.params.LAYERS, "sooper", "mergeNewParams() overwrites well");
|
||||||
t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() adds well");
|
t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() adds well");
|
||||||
t.ok( layer.grid[0][0].url.match("CHICKPEAS"), "CHICKPEAS is in URL of first tile in grid" );
|
|
||||||
|
|
||||||
newParams.CHICKPEAS = 151;
|
newParams.CHICKPEAS = 151;
|
||||||
|
|
||||||
t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
||||||
|
|||||||
Reference in New Issue
Block a user