[OpenLayers-Commits] r11042 - in trunk/openlayers: examples lib/OpenLayers/Layer/Google theme/default

[commits-20090109 at openlayers.org]

Author: ahocevar
Date: 2011-01-19 04:01:28 -0800 (Wed, 19 Jan 2011)
New Revision: 11042

Modified:
   trunk/openlayers/examples/google-v3.html
   trunk/openlayers/examples/osm-google.html
   trunk/openlayers/lib/OpenLayers/Layer/Google/v3.js
   trunk/openlayers/theme/default/google.css
   trunk/openlayers/theme/default/style.css
Log:
Fix Google layer to work with the v3.3 api. Update examples from v3.2 to v3.3. r=bartvde (closes #2984)


Modified: trunk/openlayers/examples/google-v3.html
===================================================================
--- trunk/openlayers/examples/google-v3.html	2011-01-18 14:53:55 UTC (rev 11041)
+++ trunk/openlayers/examples/google-v3.html	2011-01-19 12:01:28 UTC (rev 11042)
@@ -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>

Modified: trunk/openlayers/examples/osm-google.html
===================================================================
--- trunk/openlayers/examples/osm-google.html	2011-01-18 14:53:55 UTC (rev 11041)
+++ trunk/openlayers/examples/osm-google.html	2011-01-19 12:01:28 UTC (rev 11042)
@@ -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>

Modified: trunk/openlayers/lib/OpenLayers/Layer/Google/v3.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Layer/Google/v3.js	2011-01-18 14:53:55 UTC (rev 11041)
+++ trunk/openlayers/lib/OpenLayers/Layer/Google/v3.js	2011-01-19 12:01:28 UTC (rev 11042)
@@ -134,6 +134,11 @@
 
         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;

Modified: trunk/openlayers/theme/default/google.css
===================================================================
--- trunk/openlayers/theme/default/google.css	2011-01-18 14:53:55 UTC (rev 11041)
+++ trunk/openlayers/theme/default/google.css	2011-01-19 12:01:28 UTC (rev 11042)
@@ -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;
+}
 

Modified: trunk/openlayers/theme/default/style.css
===================================================================
--- trunk/openlayers/theme/default/style.css	2011-01-18 14:53:55 UTC (rev 11041)
+++ trunk/openlayers/theme/default/style.css	2011-01-19 12:01:28 UTC (rev 11042)
@@ -16,12 +16,18 @@
 
 .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;