Ticket #686: openlayers-google.patch

lib/OpenLayers/Util.js

@@ -966 +966 @@
-    }
-    return head;
-};
+
+OpenLayers.Util.PI = Math.PI;
+OpenLayers.Util.HALF_PI = OpenLayers.Util.PI * 0.5;
+OpenLayers.Util.TWO_PI = OpenLayers.Util.PI * 2.0;
+OpenLayers.Util.EPSLN = 1.0e-10;
+OpenLayers.Util.D2R = 0.0174532925199;
+
+// Function to compute the constant small t for use in the forward
+//   computations in the Lambert Conformal Conic and the Polar
+//   Stereographic projections.
+// -----------------------------------------------------------------
+OpenLayers.Util.tsfnz = function(eccent, phi, sinphi) {
+  var con = eccent * sinphi;
+  var com = .5 * eccent;
+  con = Math.pow(((1.0 - con) / (1.0 + con)), com);
+  return (Math.tan(.5 * (OpenLayers.Util.HALF_PI - phi)) / con);
+}
+
+OpenLayers.Util.adjust_lon = function(x) {
+    var x = (Math.abs(x) < OpenLayers.Util.PI) ?
+        x : (x - (sign(x) * OpenLayers.Util.TWO_PI));
+    return(x);
+}
+
+OpenLayers.Util.ll2m = function(coords) {
+    var r_major = 6378137.0;
+    var r_minor = 6356752.31424518;
+    var lon_center = 0.0;
+    var lat_origin = 0.0;
+    var false_northing = 0.0;
+    var false_easting = 0.0;
+    var temp = r_minor / r_major;
+    var es=1.0 - Math.sqrt(temp);
+    var e = Math.sqrt(es);
+    var m1 = Math.cos(lat_origin) / (Math.sqrt( 1.0 - es * Math.sin(lat_origin) * Math.sin(lat_origin)));
+
+    var lon=coords[0];
+    var lat=coords[1];
+
+    // convert to radians
+    if (lat >= 90.0) { lat = 89.99; }
+    if (lat <= -90.0) { lat = -89.99; }
+    if (lon >=180.0) { lon = 179; }
+    if (lon <=-180.0) { lon = -179; }
+
+    if (lat <= 90.0 && lat >= -90.0 && lon <= 180.0 && lon >= -180.0) {
+        lat *= OpenLayers.Util.D2R;
+        lon *= OpenLayers.Util.D2R;
+    } else {
+        alert("*** Input out of range ***: lon: " + lon + " - lat: " + lat);
+        return null;
+    }
+
+    if (Math.abs(lat)>= 90 &&
+        Math.abs(Math.abs(lat) - OpenLayers.Util.HALF_PI) <= OpenLayers.Util.EPSLN) {
+        alert("Transformation cannot be computed at the poles");
+        return null;
+    } else {
+        var sinphi = Math.sin(lat);
+        var ts = OpenLayers.Util.tsfnz(e, lat, sinphi);
+        var x = false_easting + r_major * m1 * OpenLayers.Util.adjust_lon(lon - lon_center);
+        var y = false_northing - r_major * m1 * Math.log(ts);
+    }
+    
+    return new Array(x,y);
+};
+

lib/OpenLayers/Layer/WMS.js

@@ -96 +96 @@
-        if(this.gutter) {
-            bounds = this.adjustBoundsByGutter(bounds);
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
-                     {BBOX:bounds.toBBOX(),
-                      WIDTH:this.imageSize.w,
-                      HEIGHT:this.imageSize.h});

lib/OpenLayers/Layer/Google.js

@@ -134 +134 @@
-    },
-    
-    */
+    
+    moveTo: function(bounds, zoomChanged, dragging) {
+        this.projection = this.map.projection;
+        if (this.map.zoom < 5) {
+            this.projection = "EPSG:54004";
+        }
+        OpenLayers.Layer.EventPane.prototype.moveTo.apply(this, arguments);
+    },
-    
-  //
-  // TRANSLATION: MapObject Bounds <-> OpenLayers.Bounds