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

Making row and column size consistent, as suggested by @bartvde.

Browse Source
This commit is contained in:
ahocevar
2012-08-21 13:34:49 +02:00
parent 0f58868830
commit 26d4fe3ce8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -983,9 +983,9 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
var viewSize = this.map.getSize();
var minRows = Math.ceil(viewSize.h/this.tileSize.h) +
Math.max(1, 2 * this.buffer);
2 * this.buffer + 1;
var minCols = Math.ceil(viewSize.w/this.tileSize.w) +
Math.max(1, 2 * this.buffer);
2 * this.buffer + 1;
var origin = this.getTileOrigin();
var resolution = this.getServerResolution();

12
tests/Layer/Grid.html
View File

@@ -76,8 +76,8 @@
layer = new OpenLayers.Layer.WMS(name, url, params, {buffer:2});
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
t.eq( layer.grid.length, 7, "Grid rows is correct." );
t.eq( layer.grid[0].length, 6, "Grid cols is correct." );
t.eq( layer.grid.length, 8, "Grid rows is correct." );
t.eq( layer.grid[0].length, 7, "Grid cols is correct." );
}
@@ -712,17 +712,17 @@
map.setCenter(new OpenLayers.LonLat(0, 0), 4);
t.eq( layer0.grid.length, 3, "Grid rows with buffer:0" );
map.setBaseLayer(layer1);
t.eq( layer1.grid.length, 4, "Grid rows with buffer:1" );
t.eq( layer1.grid.length, 5, "Grid rows with buffer:1" );
map.setBaseLayer(layer2);
t.eq( layer2.grid.length, 6, "Grid rows with buffer:2" );
t.eq( layer2.grid.length, 7, "Grid rows with buffer:2" );
// zooming in on Greenland exercises the bug from pre-r4313
map.setCenter(new OpenLayers.LonLat(0, 90), 4);
t.eq( layer0.grid.length, 3, "Grid rows with buffer:0" );
map.setBaseLayer(layer1);
t.eq( layer1.grid.length, 4, "Grid rows with buffer:1" );
t.eq( layer1.grid.length, 5, "Grid rows with buffer:1" );
map.setBaseLayer(layer2);
t.eq( layer2.grid.length, 6, "Grid rows with buffer:2" );
t.eq( layer2.grid.length, 7, "Grid rows with buffer:2" );
}
function test_Layer_Grid_destroy (t) {