Fix Google layer to work with the v3.3 api. Update examples from v3.2 to v3.3. r=bartvde (closes #2984)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11042 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
<link rel="stylesheet" href="../theme/default/style.css" type="text/css">
|
<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="../theme/default/google.css" type="text/css">
|
||||||
<link rel="stylesheet" href="style.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&sensor=false"></script>
|
<script src="http://maps.google.com/maps/api/js?v=3.3&sensor=false"></script>
|
||||||
<script src="../lib/OpenLayers.js"></script>
|
<script src="../lib/OpenLayers.js"></script>
|
||||||
<script src="google-v3.js"></script>
|
<script src="google-v3.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<link rel="stylesheet" href="../theme/default/style.css" type="text/css">
|
<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="../theme/default/google.css" type="text/css">
|
||||||
<link rel="stylesheet" href="style.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&sensor=false"></script>
|
<script src="http://maps.google.com/maps/api/js?v=3.3&sensor=false"></script>
|
||||||
<script src="../lib/OpenLayers.js"></script>
|
<script src="../lib/OpenLayers.js"></script>
|
||||||
<script src="osm-google.js"></script>
|
<script src="osm-google.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -134,6 +134,11 @@ OpenLayers.Layer.Google.v3 = {
|
|||||||
|
|
||||||
var cache = OpenLayers.Layer.Google.cache[this.map.id];
|
var cache = OpenLayers.Layer.Google.cache[this.map.id];
|
||||||
var container = this.map.viewPortDiv;
|
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
|
// move the ToS and branding stuff up to the container div
|
||||||
var termsOfUse = div.lastChild;
|
var termsOfUse = div.lastChild;
|
||||||
|
|||||||
@@ -3,8 +3,15 @@
|
|||||||
bottom: 2px;
|
bottom: 2px;
|
||||||
left: auto;
|
left: auto;
|
||||||
}
|
}
|
||||||
|
.olLayerGoogleV3.olLayerGoogleCopyright {
|
||||||
|
bottom: 0px;
|
||||||
|
right: 0px !important;
|
||||||
|
}
|
||||||
.olLayerGooglePoweredBy {
|
.olLayerGooglePoweredBy {
|
||||||
left: 2px;
|
left: 2px;
|
||||||
bottom: 2px;
|
bottom: 2px;
|
||||||
}
|
}
|
||||||
|
.olLayerGoogleV3.olLayerGooglePoweredBy {
|
||||||
|
bottom: 0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,12 +16,18 @@ div.olLayerDiv {
|
|||||||
|
|
||||||
.olLayerGoogleCopyright {
|
.olLayerGoogleCopyright {
|
||||||
left: 2px;
|
left: 2px;
|
||||||
bottom: 2px;
|
bottom: 2px;
|
||||||
|
}
|
||||||
|
.olLayerGoogleV3.olLayerGoogleCopyright {
|
||||||
|
right: auto !important;
|
||||||
}
|
}
|
||||||
.olLayerGooglePoweredBy {
|
.olLayerGooglePoweredBy {
|
||||||
left: 2px;
|
left: 2px;
|
||||||
bottom: 15px;
|
bottom: 15px;
|
||||||
}
|
}
|
||||||
|
.olLayerGoogleV3.olLayerGooglePoweredBy {
|
||||||
|
bottom: 15px !important;
|
||||||
|
}
|
||||||
.olControlAttribution {
|
.olControlAttribution {
|
||||||
font-size: smaller;
|
font-size: smaller;
|
||||||
right: 3px;
|
right: 3px;
|
||||||
|
|||||||
Reference in New Issue
Block a user