Changeset 9116 in josm for trunk/src

Timestamp:

2015-12-13T22:29:34+01:00 (9 years ago)

Author:

bastiK

Message:

fix projection near 180 degree meridian (see #12186)

Location:

trunk/src/org/openstreetmap/josm/data/projection/proj

Files:

• AbstractProj.java (modified) (1 diff)
• LambertConformalConic.java (modified) (2 diffs)
• TransverseMercator.java (modified) (1 diff)

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

@@ -121 +121 @@
     }
 
+    public static double normalizeLon(double lon) {
+        if (lon >= - Math.PI && lon <= Math.PI)
+            return lon;
+        else {
+            lon = lon % (2 * Math.PI);
+            if (lon > Math.PI) {
+                return lon - 2 * Math.PI;
+            } else if (lon < -Math.PI) {
+                return lon + 2 * Math.PI;
+            }
+            return lon;
+        }
+    }
 }

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

@@ -24 +24 @@
  * @author Pieren
  */
-public class LambertConformalConic implements Proj {
+public class LambertConformalConic extends AbstractProj {
 
     protected Ellipsoid ellps;
@@ -154 +154 @@
     @Override
     public double[] project(double phi, double lambda) {
+        lambda = normalizeLon(lambda);
         double sinphi = sin(phi);
         double l = (0.5*log((1+sinphi)/(1-sinphi))) - e/2*log((1+e*sinphi)/(1-e*sinphi));

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

@@ -125 +125 @@
     @Override
     public double[] project(double y, double x) {
+        x = normalizeLon(x);
         double sinphi = Math.sin(y);
         double cosphi = Math.cos(y);