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

[commits-20090109 at openlayers.org]

Author: ahocevar
Date: 2011-01-07 10:50:23 -0800 (Fri, 07 Jan 2011)
New Revision: 11018

Modified:
   trunk/openlayers/examples/google-v3.html
   trunk/openlayers/examples/osm-google.html
   trunk/openlayers/lib/OpenLayers/Layer/Google/v3.js
   trunk/openlayers/lib/OpenLayers/Renderer/SVG.js
   trunk/openlayers/theme/default/google.css
   trunk/openlayers/theme/default/style.css
Log:
Reverted a part of r10976 which removed code that is still needed. Thanks cmoullet for spotting this. r=me (closes #2985)


Modified: trunk/openlayers/examples/google-v3.html
===================================================================
--- trunk/openlayers/examples/google-v3.html	2011-01-07 00:13:46 UTC (rev 11017)
+++ trunk/openlayers/examples/google-v3.html	2011-01-07 18:50:23 UTC (rev 11018)
@@ -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>

Modified: trunk/openlayers/examples/osm-google.html
===================================================================
--- trunk/openlayers/examples/osm-google.html	2011-01-07 00:13:46 UTC (rev 11017)
+++ trunk/openlayers/examples/osm-google.html	2011-01-07 18:50:23 UTC (rev 11018)
@@ -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>

Modified: trunk/openlayers/lib/OpenLayers/Layer/Google/v3.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Layer/Google/v3.js	2011-01-07 00:13:46 UTC (rev 11017)
+++ trunk/openlayers/lib/OpenLayers/Layer/Google/v3.js	2011-01-07 18:50:23 UTC (rev 11018)
@@ -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/lib/OpenLayers/Renderer/SVG.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Renderer/SVG.js	2011-01-07 00:13:46 UTC (rev 11017)
+++ trunk/openlayers/lib/OpenLayers/Renderer/SVG.js	2011-01-07 18:50:23 UTC (rev 11018)
@@ -329,11 +329,17 @@
             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] + ")");
+                }
             }
         }
         

Modified: trunk/openlayers/theme/default/google.css
===================================================================
--- trunk/openlayers/theme/default/google.css	2011-01-07 00:13:46 UTC (rev 11017)
+++ trunk/openlayers/theme/default/google.css	2011-01-07 18:50:23 UTC (rev 11018)
@@ -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-07 00:13:46 UTC (rev 11017)
+++ trunk/openlayers/theme/default/style.css	2011-01-07 18:50:23 UTC (rev 11018)
@@ -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;