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

Use valid tile bounds and test grid crossing the dateline.

Browse Source
This commit is contained in:
ahocevar
2011-12-03 00:07:04 +01:00
parent 84b30d3699
commit b70ea9e8c1
6 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/Layer/Grid.html
View File

@@ -94,14 +94,14 @@
function test_Layer_Grid_getTilesBounds(t) { function test_Layer_Grid_getTilesBounds(t) {
t.plan(3); t.plan(4);
layer = new OpenLayers.Layer.WMS(name, url, params); layer = new OpenLayers.Layer.WMS(name, url, params);
//normal grid //normal grid
var bl = { bounds: new OpenLayers.Bounds(1,2,0,0)}; var bl = { bounds: new OpenLayers.Bounds(1,2,2,3)};
var tr = { bounds: new OpenLayers.Bounds(0,0,3,4)}; var tr = { bounds: new OpenLayers.Bounds(2,3,3,4)};
layer.grid = [ [6, tr], layer.grid = [ [6, tr],
[bl, 7]]; [bl, 7]];
@@ -123,6 +123,17 @@
bounds = layer.getTilesBounds(); bounds = layer.getTilesBounds();
t.ok( bounds.equals(testBounds), "getTilesBounds() returns correct bounds"); t.ok( bounds.equals(testBounds), "getTilesBounds() returns correct bounds");
//world wrapped around the dateline
var bl = { bounds: new OpenLayers.Bounds(0,-90,180,90)};
var tr = { bounds: new OpenLayers.Bounds(-180,-90,0,90)};
layer.grid = [[bl, tr]];
var bounds = layer.getTilesBounds();
console.log(bounds);
var testBounds = new OpenLayers.Bounds(0,-90,360,90);
t.ok( bounds.equals(testBounds), "getTilesBounds() returns correct bounds");
} }
@@ -159,7 +170,7 @@
function test_Layer_Grid_moveTo(t) { function test_Layer_Grid_moveTo(t) {
t.plan(14); t.plan(12);
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS(name, url, params); layer = new OpenLayers.Layer.WMS(name, url, params);
@@ -280,13 +291,6 @@
layer.grid = [ [ {} ] ]; layer.grid = [ [ {} ] ];
layer.singleTile = false; layer.singleTile = false;
// drastic pan
clearTestBounds();
tilesBounds = new OpenLayers.Bounds(-150,-150,-120,-120);
layer.moveTo(null, zoomChanged);
t.ok(g_WhichFunc == "InitGridded", "if tiles drastically out of bounds, we call initGriddedTile()");
t.ok(g_Bounds.equals(b), "if tiles drastically out of bounds, we call initGriddedTile() with correct bounds");
//regular move //regular move
clearTestBounds(); clearTestBounds();
tilesBounds = new OpenLayers.Bounds(10,10,120,120); tilesBounds = new OpenLayers.Bounds(10,10,120,120);

4
tests/Layer/KaMap.html
View File

@@ -94,8 +94,8 @@
layer = new OpenLayers.Layer.KaMap(name, url, params, units); layer = new OpenLayers.Layer.KaMap(name, url, params, units);
var bl = { bounds: new OpenLayers.Bounds(1,2,0,0)}; var bl = { bounds: new OpenLayers.Bounds(1,2,2,3)};
var tr = { bounds: new OpenLayers.Bounds(0,0,3,4)}; var tr = { bounds: new OpenLayers.Bounds(2,3,3,4)};
layer.grid = [ [6, tr], layer.grid = [ [6, tr],
[bl, 7]]; [bl, 7]];

4
tests/Layer/TMS.html
View File

@@ -42,8 +42,8 @@
layer = new OpenLayers.Layer.TMS(name, url, options); layer = new OpenLayers.Layer.TMS(name, url, options);
var bl = { bounds: new OpenLayers.Bounds(1,2,0,0)}; var bl = { bounds: new OpenLayers.Bounds(1,2,2,3)};
var tr = { bounds: new OpenLayers.Bounds(0,0,3,4)}; var tr = { bounds: new OpenLayers.Bounds(2,3,3,4)};
layer.grid = [ [6, tr], layer.grid = [ [6, tr],
[bl, 7]]; [bl, 7]];

4
tests/Layer/TileCache.html
View File

@@ -66,8 +66,8 @@
var options = {'type':'png'}; var options = {'type':'png'};
var layer = new OpenLayers.Layer.TileCache(name, url, layername, options); var layer = new OpenLayers.Layer.TileCache(name, url, layername, options);
var bl = { bounds: new OpenLayers.Bounds(1,2,0,0)}; var bl = { bounds: new OpenLayers.Bounds(1,2,2,3)};
var tr = { bounds: new OpenLayers.Bounds(0,0,3,4)}; var tr = { bounds: new OpenLayers.Bounds(2,3,3,4)};
layer.grid = [ [6, tr], layer.grid = [ [6, tr],
[bl, 7]]; [bl, 7]];

4
tests/Layer/WMTS.html
View File

@@ -119,8 +119,8 @@
tileSize: new OpenLayers.Size(512, 512), tileSize: new OpenLayers.Size(512, 512),
requestEncoding: "REST" requestEncoding: "REST"
}); });
var bl = {bounds: new OpenLayers.Bounds(1,2,0,0)}; var bl = {bounds: new OpenLayers.Bounds(1,2,2,3)};
var tr = {bounds: new OpenLayers.Bounds(0,0,3,4)}; var tr = {bounds: new OpenLayers.Bounds(2,3,3,4)};
layer1.grid = [[6, tr],[bl, 7]]; layer1.grid = [[6, tr],[bl, 7]];
var bounds = layer1.getTilesBounds(); var bounds = layer1.getTilesBounds();
var testBounds = new OpenLayers.Bounds(1,2,3,4); var testBounds = new OpenLayers.Bounds(1,2,3,4);

4
tests/Layer/XYZ.html
View File

@@ -41,8 +41,8 @@
layer = new OpenLayers.Layer.XYZ(name, url, options); layer = new OpenLayers.Layer.XYZ(name, url, options);
var bl = { bounds: new OpenLayers.Bounds(1,2,0,0)}; var bl = { bounds: new OpenLayers.Bounds(1,2,2,3)};
var tr = { bounds: new OpenLayers.Bounds(0,0,3,4)}; var tr = { bounds: new OpenLayers.Bounds(2,3,3,4)};
layer.grid = [ [6, tr], layer.grid = [ [6, tr],
[bl, 7]]; [bl, 7]];