Changeset 9579 in josm for trunk/src

Timestamp:

2016-01-23T14:11:05+01:00 (9 years ago)

Author:

bastiK

Message:

fix bounds that are too large and make tests fail (see #12186)

File:

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

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

@@ -43 +43 @@
     private double b0;
     private double k;
+    private double phi0;
 
     private static final double EPSILON = 1e-11;
@@ -55 +56 @@
 
     private void initialize(double lat_0) {
-        double phi0 = toRadians(lat_0);
+        phi0 = toRadians(lat_0);
         kR = sqrt(1 - ellps.e2) / (1 - (ellps.e2 * pow(sin(phi0), 2)));
         alpha = sqrt(1 + (ellps.eb2 * pow(cos(phi0), 4)));
@@ -118 +119 @@
     @Override
     public Bounds getAlgorithmBounds() {
-        return new Bounds(-85, -179, 85, 179, false);
+        if (phi0 > 0) {
+            return new Bounds(-10, -40, 85, 40, false);
+        } else {
+            return new Bounds(-85, -40, 10, 40, false);
+        }
     }
 }