Ticket #1004: safeGoogle.patch

lib/OpenLayers/Layer/Google.js

@@ -103 +103 @@
-            // create GMap, hide nav controls
-            this.mapObject = new GMap2( this.div );
-
-
-
-
-
-
-
-
-
+
+
-
-            var termsOfUse = this.div.lastChild;
-            this.div.removeChild(termsOfUse);
-            this.pane.appendChild(termsOfUse);
-            termsOfUse.className = "olLayerGoogleCopyright";
-            termsOfUse.style.right = "";
-            termsOfUse.style.bottom = "";
-
-        } catch (e) {
-            // do not crash
-        }
@@ -157 +144 @@
-    },
-
-    /**
+     * Method: moveSpecialDivsToEventPane
+     * Move the "Powered By" and "Terms of Use" divs to the eventPane so that
+     *     the user will still be able to click on them.
+     */
+    moveSpecialDivsToEventPane: function() {
+        // move the ToS and branding stuff up to the pane
+        // thanks a *mil* Erik for thinking of this
+        var poweredBy = this.div.lastChild;
+        if (poweredBy) {
+            this.div.removeChild(poweredBy);
+            this.pane.appendChild(poweredBy);
+            poweredBy.className = "olLayerGooglePoweredBy gmnoprint";
+            poweredBy.style.left = "";
+            poweredBy.style.bottom = "";
+        } else {
+            var msg = "Google Maps has changed its internal " + 
+                "workings and has therefore caused an error in " +
+                "the OpenLayers.Layer.Google layer. " + 
+                "Specifically, OL was unable to find the " +
+                "'Powered By' div to move it to the eventPane.";
+            OpenLayers.Console.warn(msg);
+        }
+        
+        var termsOfUse = this.div.lastChild;
+        if (termsOfUse) {
+            this.div.removeChild(termsOfUse);
+            this.pane.appendChild(termsOfUse);
+            termsOfUse.className = "olLayerGoogleCopyright";
+            termsOfUse.style.right = "";
+            termsOfUse.style.bottom = "";
+        } else {
+            var msg = "Google Maps has changed its internal " + 
+                "workings and has therefore caused an error in " +
+                "the OpenLayers.Layer.Google layer. " + 
+                "Specifically, OL was unable to find the " +
+                "'Terms of Use' div to move it to the eventPane.";
+            OpenLayers.Console.warn(msg);
+        }
+    },
+
+    /**
-     * APIMethod: onMapResize
-     * 
-     * Parameters:
@@ -273 +301 @@
-                var gPoint = this.fromLatLngToDivPixel(gLatLng);
-      
-                // locate the sliding "Div" div
-
+
+
+
+
+
+
+
+
-  
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return gPoint;
-            };
-        }