Merge tag 'v2.3.3' into fiksgatami-dev

1 files changed, 10 insertions, 2 deletions

diff --git a/web/vendor/OpenLayers.Projection.OrdnanceSurvey.js b/web/vendor/OpenLayers.Projection.OrdnanceSurvey.js
index 85574d8e0..339f57a93 100644
--- a/web/vendor/OpenLayers.Projection.OrdnanceSurvey.js
+++ b/web/vendor/OpenLayers.Projection.OrdnanceSurvey.js
@@ -107,11 +107,19 @@ OpenLayers.Projection.OS = {
     },
   
     goog2osgb: function(point) {
-        return OpenLayers.Projection.OS.projectForwardBritish(OpenLayers.Layer.SphericalMercator.projectInverse(point));
+        var p1 = OpenLayers.Layer.SphericalMercator.inverseMercator(point.x, point.y);
+        var p2 = OpenLayers.Projection.OS.projectForwardBritish({x: p1.lon, y: p1.lat});
+        point.x = p2.x;
+        point.y = p2.y;
+        return point;
     },
   
     osgb2goog: function(point) {
-        return OpenLayers.Layer.SphericalMercator.projectForward(OpenLayers.Projection.OS.projectInverseBritish(point));
+        var p1 = OpenLayers.Projection.OS.projectInverseBritish(point);
+        var p2 = OpenLayers.Layer.SphericalMercator.forwardMercator(p1.x, p1.y);
+        point.x = p2.lon;
+        point.y = p2.lat;
+        return point;
     },
     
     /*****