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

Remove extra WMS subclasses.

Browse Source
This commit is contained in:
Tim Schaub
2011-11-08 22:45:13 -07:00
parent ab225e36b9
commit 7b6887c954
10 changed files with 164 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Layer/Google.html
+2 -2
View File
@@ -196,9 +196,9 @@
{ controls: [] , 'numZoomLevels':20});
var satellite = new OpenLayers.Layer.Google( "Google Satellite" , {type: G_SATELLITE_MAP, 'maxZoomLevel':18} );
var layer = new OpenLayers.Layer.WMS.Untiled( "OpenLayers WMS",
var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic', 'transparent':true},
{isBaseLayer: false} );
{isBaseLayer: false, singleTile: true} );
map.addLayers([satellite, layer]);
map.setCenter(new OpenLayers.LonLat(10.205188,48.857593), 5);
tests/Layer/Google/v3.html
+2 -2
View File
@@ -146,9 +146,9 @@
{ controls: [] , 'numZoomLevels':20});
var satellite = new OpenLayers.Layer.Google( "Google Satellite" , {type: google.maps.MapTypeId.SATELLITE, 'maxZoomLevel':18} );
var layer = new OpenLayers.Layer.WMS.Untiled( "OpenLayers WMS",
var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic', 'transparent':true},
{isBaseLayer: false} );
{isBaseLayer: false, singleTile: true} );
map.addLayers([satellite, layer]);
map.setCenter(new OpenLayers.LonLat(10.205188,48.857593), 5);
tests/Layer/WMS.html
-13
View File
@@ -445,19 +445,6 @@
}
// DEPRECATED -- REMOVE IN 3.0
function test_Layer_Untiled_WMS(t) {
t.plan(1);
var layer = new OpenLayers.Layer.WMS.Untiled();
var clone = layer.clone();
t.ok(clone.singleTile, "regression test: clone works. this is for #1013");
}
function test_Layer_WMS_destroy (t) {
t.plan( 1 );
tests/Layer/WMS/Post.html
-88
View File
@@ -1,88 +0,0 @@
<html>
<head>
<script src="../../OLLoader.js"></script>
<script type="text/javascript">
var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
var isOpera = (navigator.userAgent.indexOf("Opera") != -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/jpeg'};
function test_Layer_WMS_Post_constructor (t) {
t.plan( 2 );
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
var options = {unsupportedBrowsers: []};
layer = new OpenLayers.Layer.WMS.Post(name, url, params, options);
t.eq(
layer.usePost, true,
"Supported browsers use IFrame tiles.");
layer.destroy();
var options = { unsupportedBrowsers: [OpenLayers.BROWSER_NAME]};
layer = new OpenLayers.Layer.WMS.Post(name, url, params, options);
t.eq(
layer.usePost, false,
"unsupported browsers use Image tiles.");
layer.destroy();
}
function test_Layer_WMS_Post_addtile (t) {
t.plan( 3 );
layer = new OpenLayers.Layer.WMS.Post(name, url, params);
var map = new OpenLayers.Map('map');
map.addLayer(layer);
var bounds = new OpenLayers.Bounds(1,2,3,4);
var pixel = new OpenLayers.Pixel(5,6);
var tile = layer.addTile(bounds, pixel);
if(isMozilla || isOpera) {
t.ok(
tile instanceof OpenLayers.Tile.Image,
"tile is an instance of OpenLayers.Tile.Image");
}
else {
t.ok(
tile.useIFrame !== undefined,
"tile is created with the OpenLayers.Tile.Image.IFrame mixin");
}
map.destroy();
// test the unsupported browser
layer = new OpenLayers.Layer.WMS.Post(name, url, params, {
unsupportedBrowsers: [OpenLayers.BROWSER_NAME]
});
map = new OpenLayers.Map('map');
map.addLayer(layer);
tile = layer.addTile(bounds, pixel);
t.ok(
tile instanceof OpenLayers.Tile.Image,
"unsupported browser: tile is an instance of Tile.Image");
layer.destroy();
// test a supported browser
layer = new OpenLayers.Layer.WMS.Post(name, url, params, {
unsupportedBrowsers: []
});
map.addLayer(layer);
var tile2 = layer.addTile(bounds, pixel);
tile2.draw();
t.eq(
tile2.useIFrame, true,
"supported browser: tile is created with the Tile.Image.IFrame mixin");
map.destroy();
}
</script>
</head>
<body>
<div id="map" style="width:500px;height:550px"></div>
</body>
</html>