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

Fix Google layer to work with the v3.3 api. Update examples from v3.2 to v3.3. r=bartvde (closes #2984)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11042 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2011-01-19 12:01:28 +00:00
parent fcdd918170
commit edfbcb0a5e
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/google-v3.html
View File

@@ -5,7 +5,7 @@
<link rel="stylesheet" href="../theme/default/style.css" type="text/css">
<link rel="stylesheet" href="../theme/default/google.css" type="text/css">
<link rel="stylesheet" href="style.css" type="text/css">
<script src="http://maps.google.com/maps/api/js?v=3.2&amp;sensor=false"></script>
<script src="http://maps.google.com/maps/api/js?v=3.3&amp;sensor=false"></script>
<script src="../lib/OpenLayers.js"></script>
<script src="google-v3.js"></script>
</head>

2
examples/osm-google.html
View File

@@ -5,7 +5,7 @@
<link rel="stylesheet" href="../theme/default/style.css" type="text/css">
<link rel="stylesheet" href="../theme/default/google.css" type="text/css">
<link rel="stylesheet" href="style.css" type="text/css">
<script src="http://maps.google.com/maps/api/js?v=3.2&amp;sensor=false"></script>
<script src="http://maps.google.com/maps/api/js?v=3.3&amp;sensor=false"></script>
<script src="../lib/OpenLayers.js"></script>
<script src="osm-google.js"></script>
</head>

5
lib/OpenLayers/Layer/Google/v3.js
View File

@@ -134,6 +134,11 @@ OpenLayers.Layer.Google.v3 = {
var cache = OpenLayers.Layer.Google.cache[this.map.id];
var container = this.map.viewPortDiv;
// move the Map Data popup to the container, if any
while (div.lastChild.style.display == "none") {
container.appendChild(div.lastChild);
}
// move the ToS and branding stuff up to the container div
var termsOfUse = div.lastChild;

7
theme/default/google.css
View File

@@ -3,8 +3,15 @@
bottom: 2px;
left: auto;
}
.olLayerGoogleV3.olLayerGoogleCopyright {
bottom: 0px;
right: 0px !important;
}
.olLayerGooglePoweredBy {
left: 2px;
bottom: 2px;
}
.olLayerGoogleV3.olLayerGooglePoweredBy {
bottom: 0px !important;
}

8
theme/default/style.css
View File

@@ -16,12 +16,18 @@ div.olLayerDiv {
.olLayerGoogleCopyright {
left: 2px;
bottom: 2px;
bottom: 2px;
}
.olLayerGoogleV3.olLayerGoogleCopyright {
right: auto !important;
}
.olLayerGooglePoweredBy {
left: 2px;
bottom: 15px;
}
.olLayerGoogleV3.olLayerGooglePoweredBy {
bottom: 15px !important;
}
.olControlAttribution {
font-size: smaller;
right: 3px;