Changeset 9558 in josm for trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java

Timestamp:

2016-01-21T16:46:00+01:00 (8 years ago)

Author:

bastiK

Message:

always normalize longitude before projection and after inverse projection (see #12186)

File:

• trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java

@@ -288 +288 @@
                 lon2 += 2.0 * Math.PI;
             }
-            centralMeridian = normalizeLon(0.5 * (lon1 + lon2) -
+            centralMeridian = normalizeLonRad(0.5 * (lon1 + lon2) -
                      Math.atan(J * Math.tan(0.5 * B * (lon1 - lon2)) / P) / B);
-            gamma0 = Math.atan(2.0 * Math.sin(B * normalizeLon(lon1 - centralMeridian)) /
+            gamma0 = Math.atan(2.0 * Math.sin(B * normalizeLonRad(lon1 - centralMeridian)) /
                      (Fp - 1.0 / Fp));
             azimuth = Math.asin(D * Math.sin(gamma0));
@@ -359 +359 @@
     }
 
+    private double normalizeLonRad(double a) {
+        return Math.toRadians(LatLon.normalizeLon(Math.toDegrees(a)));
+    }
+
     @Override
     public double[] project(double y, double x) {
-        x = normalizeLon(x);
         double u, v;
         if (Math.abs(Math.abs(y) - Math.PI/2.0) > EPSILON) {