Merge 2.0 branch to trunk.
git-svn-id: http://svn.openlayers.org/trunk/openlayers@1369 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -114,13 +114,13 @@
|
||||
* -insertColumn
|
||||
* -insertRow
|
||||
|
||||
function test_07_Layer_Grid_moveTo(t) {
|
||||
function 07_Layer_Grid_moveTo(t) {
|
||||
}
|
||||
|
||||
function test_08_Layer_Grid_insertColumn(t) {
|
||||
function 08_Layer_Grid_insertColumn(t) {
|
||||
}
|
||||
|
||||
function test_09_Layer_Grid_insertRow(t) {
|
||||
function 09_Layer_Grid_insertRow(t) {
|
||||
}
|
||||
|
||||
*
|
||||
@@ -166,41 +166,15 @@
|
||||
}
|
||||
|
||||
|
||||
function test_11_Layer_Grid_getTile(t) {
|
||||
|
||||
t.plan(2);
|
||||
|
||||
var options = {tileSize: new OpenLayers.Size(500,50)};
|
||||
var map = new OpenLayers.Map('map', options);
|
||||
|
||||
//test with tile creation
|
||||
layer = new OpenLayers.Layer.WMS(name, url, params);
|
||||
map.addLayer(layer);
|
||||
|
||||
map.setCenter(new OpenLayers.LonLat(0,0), 5);
|
||||
|
||||
//grab a reference to one of the tiles
|
||||
var tile = layer.grid[0][0];
|
||||
|
||||
var gotTile = layer.getTile(tile.id);
|
||||
|
||||
t.ok( gotTile == tile, "got right tile");
|
||||
|
||||
gotTile = layer.getTile("chicken");
|
||||
t.ok( gotTile == null, "getTile() of bogus id returns null");
|
||||
}
|
||||
|
||||
|
||||
function test_99_Layer_Grid_destroy (t) {
|
||||
|
||||
t.plan( 4 );
|
||||
t.plan( 3 );
|
||||
|
||||
var map = new OpenLayers.Map('map');
|
||||
layer = new OpenLayers.Layer.Grid(name, url, params);
|
||||
map.addLayer(layer);
|
||||
layer.destroy();
|
||||
t.eq( layer.grid, null, "layer.grid is null after destroy" );
|
||||
t.eq( layer.alpha, null, "layer.alpha is null after destroy" );
|
||||
t.eq( layer.tileSize, null, "layer.tileSize is null after destroy" );
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user