499c8db92a
other than WMS. It should do this for any Grid layer. Ticket #496 includes a patch for this: it adds a mergeNewParams call at the Layer.Grid level, (subclassing Layer.HTTPRequest) which reinits the tile grid. This commit also includes tests for this functionality. Since testing directly on the Grid layer doesn't work (it's meant to be subclassed), we need to instead pick a second layer to test -- in this case, ka-Map. Thanks to Bill Woodall for the patch. git-svn-id: http://svn.openlayers.org/trunk/openlayers@2237 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
221 lines
6.5 KiB
HTML
221 lines
6.5 KiB
HTML
<html>
|
|
<head>
|
|
<script src="../lib/OpenLayers.js"></script>
|
|
<script type="text/javascript"><!--
|
|
var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
|
|
var layer;
|
|
|
|
var name = 'Test Layer';
|
|
var url = "http://boston.freemap.in/tile.php?";
|
|
var params = {
|
|
'map':'boston-new',
|
|
'g':'border,water,roads,openspace',
|
|
'i':'JPEG'
|
|
};
|
|
var units = "meters";
|
|
|
|
|
|
|
|
function test_01_Layer_KaMap_constructor (t) {
|
|
t.plan( 1 );
|
|
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
t.ok( layer instanceof OpenLayers.Layer.KaMap, "returns OpenLayers.Layer.KaMap object" );
|
|
}
|
|
|
|
|
|
function test_02_Layer_KaMap_inittiles (t) {
|
|
t.plan( 2 );
|
|
var map = new OpenLayers.Map($('map'));
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
map.addLayer(layer);
|
|
map.setCenter(new OpenLayers.LonLat(0,0),5);
|
|
t.eq( layer.grid.length, 6, "KaMap rows is correct." );
|
|
t.eq( layer.grid[0].length, 4, "KaMap cols is correct." );
|
|
|
|
}
|
|
|
|
function test_03_Layer_KaMap_clearTiles (t) {
|
|
t.plan( 1 );
|
|
var map = new OpenLayers.Map('map');
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
map.addLayer(layer);
|
|
|
|
map.setCenter(new OpenLayers.LonLat(0,0));
|
|
|
|
//grab a reference to one of the tiles
|
|
var tile = layer.grid[0][0];
|
|
|
|
layer.clearGrid();
|
|
|
|
t.ok( layer.grid != null, "layer.grid does not get nullified" );
|
|
}
|
|
|
|
|
|
function test_04_Layer_KaMap_getKaMapBounds(t) {
|
|
t.plan( 1 );
|
|
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
|
|
var bl = { bounds: new OpenLayers.Bounds(1,2,0,0)};
|
|
var tr = { bounds: new OpenLayers.Bounds(0,0,3,4)};
|
|
layer.grid = [ [6, tr],
|
|
[bl, 7]];
|
|
|
|
var bounds = layer.getGridBounds();
|
|
|
|
var testBounds = new OpenLayers.Bounds(1,2,3,4);
|
|
|
|
t.ok( bounds.equals(testBounds), "getKaMapBounds() returns correct bounds")
|
|
|
|
layer.grid = null;
|
|
}
|
|
|
|
function test_05_Layer_KaMap_getResolution(t) {
|
|
t.plan( 1 );
|
|
|
|
var map = new OpenLayers.Map('map');
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
map.addLayer(layer);
|
|
|
|
map.zoom = 5;
|
|
|
|
t.eq( layer.getResolution(), 0.0439453125, "getResolution() returns correct value");
|
|
}
|
|
|
|
function test_06_Layer_KaMap_getZoomForExtent(t) {
|
|
t.plan( 2 );
|
|
var bounds, zoom;
|
|
|
|
var map = new OpenLayers.Map('map');
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
map.addLayer(layer);
|
|
|
|
bounds = new OpenLayers.Bounds(10,10,12,12);
|
|
zoom = layer.getZoomForExtent(bounds);
|
|
|
|
t.eq( zoom, 8, "getZoomForExtent() returns correct value");
|
|
|
|
bounds = new OpenLayers.Bounds(10,10,100,100);
|
|
zoom = layer.getZoomForExtent(bounds);
|
|
|
|
t.eq( zoom, 2, "getZoomForExtent() returns correct value");
|
|
}
|
|
|
|
function test_06_Layer_kaMap_mergeNewParams (t) {
|
|
t.plan( 5 );
|
|
|
|
var map = new OpenLayers.Map("map");
|
|
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params);
|
|
|
|
var newParams = { layers: 'sooper',
|
|
chickpeas: 'image/png'};
|
|
|
|
map.addLayer(layer);
|
|
map.zoomToMaxExtent();
|
|
t.ok( !layer.grid[0][0].url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
|
|
|
|
layer.mergeNewParams(newParams);
|
|
|
|
t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites 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;
|
|
|
|
t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() makes clean copy of hashtable");
|
|
}
|
|
|
|
|
|
/** THIS WOULD BE WHERE THE TESTS WOULD GO FOR
|
|
*
|
|
* -moveTo
|
|
* -insertColumn
|
|
* -insertRow
|
|
|
|
function 07_Layer_KaMap_moveTo(t) {
|
|
}
|
|
|
|
function 08_Layer_KaMap_insertColumn(t) {
|
|
}
|
|
|
|
function 09_Layer_KaMap_insertRow(t) {
|
|
}
|
|
|
|
*
|
|
*/
|
|
|
|
function test_10_Layer_KaMap_clone(t) {
|
|
t.plan(4);
|
|
|
|
var options = {tileSize: new OpenLayers.Size(500,50)};
|
|
var map = new OpenLayers.Map('map', options);
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
map.addLayer(layer);
|
|
|
|
layer.grid = [ [6, 7],
|
|
[8, 9]];
|
|
|
|
var clone = layer.clone();
|
|
|
|
t.ok( clone.grid != layer.grid, "clone does not copy grid");
|
|
|
|
t.ok( clone.tileSize.equals(layer.tileSize), "tileSize correctly cloned");
|
|
|
|
layer.tileSize.w += 40;
|
|
|
|
t.eq( clone.tileSize.w, 500, "changing layer.tileSize does not change clone.tileSize -- a fresh copy was made, not just copied reference");
|
|
|
|
t.eq( clone.alpha, layer.alpha, "alpha copied correctly");
|
|
|
|
layer.grid = null;
|
|
}
|
|
|
|
function test_11_Layer_KaMap_setMap(t) {
|
|
|
|
t.plan(2);
|
|
|
|
var options = {tileSize: new OpenLayers.Size(500,50)};
|
|
var map = new OpenLayers.Map('map', options);
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
|
|
|
|
layer.setMap(map);
|
|
|
|
t.ok( layer.tileSize != null, "tileSize has been set");
|
|
t.ok( (layer.tileSize.h == 50) && (layer.tileSize.w == 500), "tileSize has been set correctly");
|
|
}
|
|
|
|
function test_99_Layer_KaMap_destroy (t) {
|
|
|
|
t.plan( 3 );
|
|
|
|
var map = new OpenLayers.Map('map');
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
map.addLayer(layer);
|
|
layer.destroy();
|
|
t.eq( layer.grid, null, "layer.grid is null after destroy" );
|
|
t.eq( layer.tileSize, null, "layer.tileSize is null after destroy" );
|
|
|
|
|
|
//test with tile creation
|
|
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
|
|
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];
|
|
|
|
layer.destroy();
|
|
|
|
t.ok( layer.grid == null, "tiles appropriately destroyed");
|
|
}
|
|
|
|
// -->
|
|
</script>
|
|
</head>
|
|
<body>
|
|
<div id="map" style="width:500px;height:550px;display:none"></div>
|
|
</body>
|
|
</html>
|