conditionally run Google tests based on protocol and host - print debug statements if key is not valid - this means that tests do not fail with an invalid key
git-svn-id: http://svn.openlayers.org/trunk/openlayers@4060 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
+27
-16
@@ -270,23 +270,34 @@
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
function test_20_Layer_WMS_Reproject (t) {
|
||||
t.plan(5);
|
||||
|
||||
var map = new OpenLayers.Map('map');
|
||||
var layer = new OpenLayers.Layer.Google("Google");
|
||||
map.addLayer(layer);
|
||||
wmslayer = new OpenLayers.Layer.WMS(name, url, params, {isBaseLayer: false});
|
||||
wmslayer.isBaseLayer=false;
|
||||
map.addLayer(wmslayer);
|
||||
map.setCenter(new OpenLayers.LonLat(0,0), 5);
|
||||
function test_20_Layer_WMS_Reproject (t) {
|
||||
var validkey = (window.location.protocol == "file:") ||
|
||||
(window.location.host == "localhost") ||
|
||||
(window.location.host == "openlayers.org");
|
||||
|
||||
var tile = wmslayer.grid[0][0];
|
||||
t.eq( tile.bounds.left, -22.5, "left side matches" );
|
||||
t.eq( tile.bounds.right, -11.25, "top side matches" );
|
||||
t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom side matches" );
|
||||
t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" );
|
||||
map.destroy();
|
||||
if(validkey) {
|
||||
t.plan(5);
|
||||
|
||||
var map = new OpenLayers.Map('map');
|
||||
var layer = new OpenLayers.Layer.Google("Google");
|
||||
map.addLayer(layer);
|
||||
var wmslayer = new OpenLayers.Layer.WMS(name, url, params,
|
||||
{isBaseLayer: false});
|
||||
wmslayer.isBaseLayer=false;
|
||||
map.addLayer(wmslayer);
|
||||
map.setCenter(new OpenLayers.LonLat(0,0), 5);
|
||||
|
||||
var tile = wmslayer.grid[0][0];
|
||||
t.eq( tile.bounds.left, -22.5, "left side matches" );
|
||||
t.eq( tile.bounds.right, -11.25, "top side matches" );
|
||||
t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom side matches" );
|
||||
t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" );
|
||||
map.destroy();
|
||||
} else {
|
||||
t.plan(1);
|
||||
t.debug_print("can't test google layer from " +
|
||||
window.location.host);
|
||||
}
|
||||
|
||||
var map = new OpenLayers.Map('map');
|
||||
layer = new OpenLayers.Layer.WMS(name, url, params);
|
||||
|
||||
Reference in New Issue
Block a user