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

fixed visibility issue with allOverlays:true. r=pgiraud (closes #2328)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10079 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2010-02-17 18:12:29 +00:00
parent 876fdebec9
commit 2eb866658a
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Layer/Google.js
+4
View File
@@ -195,6 +195,10 @@ OpenLayers.Layer.Google = OpenLayers.Class(
} else { } else {
this.dragPanMapObject = null; this.dragPanMapObject = null;
} }
if(this.isBaseLayer === false) {
this.setGMapVisibility(this.div.style.display !== "none");
}
}, },
tests/Layer/Google.html
+23 -10
View File
@@ -211,18 +211,31 @@
function test_Layer_Google_setGMapVisibility(t) { function test_Layer_Google_setGMapVisibility(t) {
if(validkey) { if(validkey) {
t.plan(3); t.plan(4);
var map = new OpenLayers.Map('map');
var gmap = new OpenLayers.Layer.Google("Google Streets"); var map1 = new OpenLayers.Map('map');
var dummy = new OpenLayers.Layer("Dummy", {isBaseLayer: true}); var gmap1 = new OpenLayers.Layer.Google("Google Streets");
map.addLayers([dummy, gmap]); var dummy1 = new OpenLayers.Layer("Dummy", {isBaseLayer: true});
map.zoomToMaxExtent(); map1.addLayers([dummy1, gmap1]);
map1.zoomToMaxExtent();
t.delay_call(2, function() { t.delay_call(2, function() {
t.eq(map.baseLayer.name, "Dummy", "Dummy layer is the base layer"); t.ok(gmap1.termsOfUse.style.display == "none" || gmap1.termsOfUse.style.left == "-9999px", "termsOfUse is not visible");
t.ok(gmap.termsOfUse.style.display == "none" || gmap.termsOfUse.style.left == "-9999px", "termsOfUse is not visible"); t.eq(gmap1.poweredBy.style.display, "none", "poweredBy is not visible");
t.eq(gmap.poweredBy.style.display, "none", "poweredBy is not visible"); map1.destroy();
}); });
var map2 = new OpenLayers.Map('map', {allOverlays: true});
var gmap2 = new OpenLayers.Layer.Google("Google Streets", {visibility: false});
var dummy2 = new OpenLayers.Layer("Dummy");
map2.addLayers([gmap2, dummy2]);
map2.zoomToMaxExtent();
t.delay_call(2, function() {
t.ok(gmap2.termsOfUse.style.display == "none" || gmap2.termsOfUse.style.left == "-9999px", "allOverlays:true - termsOfUse is not visible");
t.eq(gmap2.poweredBy.style.display, "none", "allOverlays:true - poweredBy is not visible");
map2.destroy();
});
} else { } else {
t.plan(0); t.plan(0);
t.debug_print("Google tests can't be run from " + t.debug_print("Google tests can't be run from " +