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

protect 2 Google test cases for validkey

Browse Source
This commit is contained in:
Bart van den Eijnden
2013-04-23 13:28:39 +02:00
parent 2613ccb504
commit 415265db40
1 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Layer/Google.html
+74 -65
View File
@@ -237,53 +237,57 @@
} }
function test_setOpacity(t) { function test_setOpacity(t) {
if(validkey) {
t.plan(6);
t.plan(6); var map = new OpenLayers.Map("map");
var gmap = new OpenLayers.Layer.Google(
"Google Streets", // the default
{numZoomLevels: 20}
);
var ghyb = new OpenLayers.Layer.Google(
"Google Hybrid",
{type: G_HYBRID_MAP, numZoomLevels: 20}
);
var gsat = new OpenLayers.Layer.Google(
"Google Satellite",
{type: G_SATELLITE_MAP, numZoomLevels: 22}
);
map.addLayers([gmap, ghyb, gsat]);
map.zoomToMaxExtent();
var map = new OpenLayers.Map("map"); var container = map.baseLayer.mapObject.getContainer();
var gmap = new OpenLayers.Layer.Google( var opacityCheck = function(opacity) {
"Google Streets", // the default var style = container.style;
{numZoomLevels: 20} var current = style.opacity === "" ? 1 : parseFloat(style.opacity);
); if (style.filter && !style.opacity) {
var ghyb = new OpenLayers.Layer.Google( current = Number(style.filter.replace(/alpha\(opacity=(.+?)\)/, "$1"));
"Google Hybrid", }
{type: G_HYBRID_MAP, numZoomLevels: 20} return (current === opacity);
); };
var gsat = new OpenLayers.Layer.Google(
"Google Satellite",
{type: G_SATELLITE_MAP, numZoomLevels: 22}
);
map.addLayers([gmap, ghyb, gsat]);
map.zoomToMaxExtent();
var container = map.baseLayer.mapObject.getContainer(); gmap.setOpacity(0.5);
var opacityCheck = function(opacity) { t.ok(opacityCheck(0.5), "container opacity set for visible layer");
var style = container.style;
var current = style.opacity === "" ? 1 : parseFloat(style.opacity);
if (style.filter && !style.opacity) {
current = Number(style.filter.replace(/alpha\(opacity=(.+?)\)/, "$1"));
}
return (current === opacity);
};
gmap.setOpacity(0.5); ghyb.setOpacity(0.75);
t.ok(opacityCheck(0.5), "container opacity set for visible layer"); t.ok(opacityCheck(0.5), "container opacity not changed if layer not visible");
map.setBaseLayer(ghyb);
t.ok(opacityCheck(0.75), "container opacity changed to 0.75 when layer becomes visible");
ghyb.setOpacity(0.75); map.setBaseLayer(gsat);
t.ok(opacityCheck(0.5), "container opacity not changed if layer not visible"); t.ok(opacityCheck(1), "container opacity set to 1 by default");
map.setBaseLayer(ghyb); gsat.setOpacity(0.25);
t.ok(opacityCheck(0.75), "container opacity changed to 0.75 when layer becomes visible"); t.ok(opacityCheck(0.25), "container opacity changed to 0.25 for visible layer");
map.setBaseLayer(gsat); map.setBaseLayer(gmap);
t.ok(opacityCheck(1), "container opacity set to 1 by default"); t.ok(opacityCheck(0.5), "container opacity set to layer opacity");
gsat.setOpacity(0.25);
t.ok(opacityCheck(0.25), "container opacity changed to 0.25 for visible layer");
map.setBaseLayer(gmap);
t.ok(opacityCheck(0.5), "container opacity set to layer opacity");
map.destroy();
map.destroy();
} else {
t.plan(0);
t.debug_print("Google tests can't be run from " +
window.location.host);
}
} }
function test_Layer_Google_setGMapVisibility(t) { function test_Layer_Google_setGMapVisibility(t) {
@@ -321,34 +325,39 @@
} }
function test_sphericalMercator(t) { function test_sphericalMercator(t) {
t.plan(4);
var map, layer;
map = new OpenLayers.Map("map"); if (validkey) {
layer = new OpenLayers.Layer.Google(); t.plan(4);
map.addLayer(layer); var map, layer;
t.ok(!layer.sphericalMercator, "sphericalMercator false by default");
t.eq(map.getProjection(), "EPSG:4326", "4326 by default without sphericalMercator");
map.destroy();
map = new OpenLayers.Map("map");
layer = new OpenLayers.Layer.Google(null, {
sphericalMercator: true
});
map.addLayer(layer);
t.eq(map.getProjection(), "EPSG:900913", "900913 by default with sphericalMercator");
map.destroy();
map = new OpenLayers.Map("map"); map = new OpenLayers.Map("map");
layer = new OpenLayers.Layer.Google(null, { layer = new OpenLayers.Layer.Google();
sphericalMercator: true, map.addLayer(layer);
projection: "EPSG:102113" t.ok(!layer.sphericalMercator, "sphericalMercator false by default");
}); t.eq(map.getProjection(), "EPSG:4326", "4326 by default without sphericalMercator");
map.addLayer(layer); map.destroy();
t.eq(map.getProjection(), "EPSG:102113", "custom code respected with sphericalMercator");
map.destroy();
map = new OpenLayers.Map("map");
layer = new OpenLayers.Layer.Google(null, {
sphericalMercator: true
});
map.addLayer(layer);
t.eq(map.getProjection(), "EPSG:900913", "900913 by default with sphericalMercator");
map.destroy();
map = new OpenLayers.Map("map");
layer = new OpenLayers.Layer.Google(null, {
sphericalMercator: true,
projection: "EPSG:102113"
});
map.addLayer(layer);
t.eq(map.getProjection(), "EPSG:102113", "custom code respected with sphericalMercator");
map.destroy();
} else {
t.plan(0);
t.debug_print("Google tests can't be run from " +
window.location.host);
}
} }