f582775d11
getMaxExtent(), getMaxResolution(), and getNumZoomLevels(). They were just wrapping around the properties. better to just access the property directly. Needed to update for these removals in many different files. - Improved initResolutions() functionality. It is now I believe both thorough and complete. The only exception is that we should maybe allow a way for the user to set up resolutions[] array using only minResolution and numZoomLevels instead of only maxResolution and numZoomLevels... but I'm not really sure anyone would ever really want to use that. And at any rate, I don't know the math for how to do it. I'm sure schuyler or Dr. 5 would. Oh. for a summary of how initResolutions works, see: http://trac.openlayers.org/wiki/SettingZoomLevels - Move getResolution(), initResolutions() out of HTTPRequest and into Layer. On thinking this through (and trying to write documentation), I realized that the real, true, GENERIC case for a layer will be using this awesome resolutions[] array that allows for setting number of zoom levels, default max resolutions, special scale arrays, etc. - Updated code for getZoomForExtent() to work with resolutions[] array, instead of using the the log 2 equation. - Move standard getZoomForExtent() and getExtent() out of Grid and into Layer. Like above, there is no reason for these methods to be found so far down in the food chain. They are part of the generic calculations for generic layers, so they belong in Layer. git-svn-id: http://svn.openlayers.org/trunk/openlayers@1379 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
202 lines
5.6 KiB
HTML
202 lines
5.6 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://octo.metacarta.com/cgi-bin/mapserv";
|
|
var params = { map: '/mapdata/vmap_wms.map',
|
|
layers: 'basic',
|
|
format: 'image/png'};
|
|
|
|
/**
|
|
* NOTE TO READER:
|
|
*
|
|
* Some of the tests on the Grid class actually use the WMS class.
|
|
* This is because WMS is a subclass of Grid and it implements the
|
|
* core functions which are necessary to test the tile-generation
|
|
* mechanism.
|
|
*
|
|
*/
|
|
|
|
|
|
function test_01_Layer_Grid_constructor (t) {
|
|
t.plan( 1 );
|
|
|
|
layer = new OpenLayers.Layer.Grid(name, url, params, null);
|
|
t.ok( layer instanceof OpenLayers.Layer.Grid, "returns OpenLayers.Layer.Grid object" );
|
|
}
|
|
|
|
|
|
function test_02_Layer_Grid_inittiles (t) {
|
|
t.plan( 2 );
|
|
var map = new OpenLayers.Map($('map'));
|
|
layer = new OpenLayers.Layer.WMS(name, url, params);
|
|
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." );
|
|
|
|
}
|
|
|
|
function test_03_Layer_Grid_clearTiles (t) {
|
|
t.plan(1);
|
|
var map = new OpenLayers.Map('map');
|
|
layer = new OpenLayers.Layer.WMS(name, url, params);
|
|
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_Grid_getGridBounds(t) {
|
|
t.plan( 1 );
|
|
|
|
layer = new OpenLayers.Layer.WMS(name, url, params);
|
|
|
|
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), "getGridBounds() returns correct bounds")
|
|
}
|
|
|
|
function test_05_Layer_Grid_getResolution(t) {
|
|
t.plan( 1 );
|
|
|
|
var map = new OpenLayers.Map('map');
|
|
layer = new OpenLayers.Layer.WMS(name, url, params);
|
|
map.addLayer(layer);
|
|
|
|
map.zoom = 5;
|
|
|
|
t.eq( layer.getResolution(), 0.0439453125, "getResolution() returns correct value");
|
|
}
|
|
|
|
function test_06_Layer_Grid_getZoomForExtent(t) {
|
|
t.plan( 2 );
|
|
var bounds, zoom;
|
|
|
|
var map = new OpenLayers.Map('map');
|
|
layer = new OpenLayers.Layer.WMS(name, url, params);
|
|
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");
|
|
}
|
|
|
|
|
|
/** THIS WOULD BE WHERE THE TESTS WOULD GO FOR
|
|
*
|
|
* -moveTo
|
|
* -insertColumn
|
|
* -insertRow
|
|
|
|
function 07_Layer_Grid_moveTo(t) {
|
|
}
|
|
|
|
function 08_Layer_Grid_insertColumn(t) {
|
|
}
|
|
|
|
function 09_Layer_Grid_insertRow(t) {
|
|
}
|
|
|
|
*
|
|
*/
|
|
|
|
function test_10_Layer_Grid_clone(t) {
|
|
t.plan(4);
|
|
|
|
var options = {tileSize: new OpenLayers.Size(500,50)};
|
|
var map = new OpenLayers.Map('map', options);
|
|
layer = new OpenLayers.Layer.Grid(name, url, params);
|
|
map.addLayer(layer);
|
|
|
|
layer.grid = [ [6, 7],
|
|
[8, 9]];
|
|
|
|
var clone = layer.clone();
|
|
|
|
t.ok( clone.grid == null, "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");
|
|
}
|
|
|
|
function test_11_Layer_Grid_setMap(t) {
|
|
|
|
t.plan(2);
|
|
|
|
var options = {tileSize: new OpenLayers.Size(500,50)};
|
|
var map = new OpenLayers.Map('map', options);
|
|
layer = new OpenLayers.Layer.Grid(name, url, params);
|
|
|
|
|
|
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_Grid_destroy (t) {
|
|
|
|
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.tileSize, null, "layer.tileSize is null after destroy" );
|
|
|
|
|
|
//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];
|
|
|
|
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>
|