From 03fd0056aa1d647909914ea32c3c8bad281b395c Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Fri, 7 Jan 2011 18:50:23 +0000
Subject: [PATCH] Reverted a part of r10976 which removed code that is still
 needed. Thanks cmoullet for spotting this. r=me (closes #2985)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@11018 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 examples/google-v3.html           |  2 +-
 examples/osm-google.html          |  2 +-
 lib/OpenLayers/Layer/Google/v3.js |  5 +++++
 lib/OpenLayers/Renderer/SVG.js    | 16 +++++++++++-----
 theme/default/google.css          |  7 +++++++
 theme/default/style.css           |  8 +++++++-
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/examples/google-v3.html b/examples/google-v3.html
index 0a7db61964..5226b44059 100644
--- a/examples/google-v3.html
+++ b/examples/google-v3.html
@@ -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?sensor=false"></script>
         <script src="../lib/OpenLayers.js"></script>
         <script src="google-v3.js"></script>
     </head>
diff --git a/examples/osm-google.html b/examples/osm-google.html
index 1ebc1780e1..3e3815271f 100644
--- a/examples/osm-google.html
+++ b/examples/osm-google.html
@@ -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&sensor=false"></script>
+        <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
         <script src="../lib/OpenLayers.js"></script>
         <script src="osm-google.js"></script>
     </head>
diff --git a/lib/OpenLayers/Layer/Google/v3.js b/lib/OpenLayers/Layer/Google/v3.js
index 37cec6e7a7..15d71b5d29 100644
--- a/lib/OpenLayers/Layer/Google/v3.js
+++ b/lib/OpenLayers/Layer/Google/v3.js
@@ -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;
diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js
index aedce27268..995a810298 100644
--- a/lib/OpenLayers/Renderer/SVG.js
+++ b/lib/OpenLayers/Renderer/SVG.js
@@ -329,11 +329,17 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
             if ((rotation !== undefined || node._rotation !== undefined) && pos) {
                 node._rotation = rotation;
                 rotation |= 0;
-                var metrics = this.symbolMetrics[id];
-                node.firstChild.setAttributeNS(null, "transform", "rotate(" 
-                    + rotation + " " 
-                    + metrics[1] + " "
-                    + metrics[2] + ")");
+                if (node.nodeName !== "svg") { 
+                    node.setAttributeNS(null, "transform", 
+                        "rotate(" + rotation + " " + pos.x + " " + 
+                        pos.y + ")"); 
+                } else {
+                    var metrics = this.symbolMetrics[id];
+                    node.firstChild.setAttributeNS(null, "transform", "rotate(" 
+                        + rotation + " " 
+                        + metrics[1] + " "
+                        + metrics[2] + ")");
+                }
             }
         }
         
diff --git a/theme/default/google.css b/theme/default/google.css
index 3c1c1872a1..3ee757c478 100644
--- a/theme/default/google.css
+++ b/theme/default/google.css
@@ -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;
+}
 
diff --git a/theme/default/style.css b/theme/default/style.css
index 6d5fd24ac1..a6adb3b429 100644
--- a/theme/default/style.css
+++ b/theme/default/style.css
@@ -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;