Changeset 4580 in josm for trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

Timestamp:

2011-11-06T15:00:56+01:00 (12 years ago)

Author:

Don-vip

Message:

see #2212 - Allow JOSM to download data crossing the 180th meridian

File:

• trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -77 +77 @@
                 return isValidLat(lat()) && isValidLon(lon());
         }
+        
+    public static double toIntervalLat(double value) {
+        if (value < -90)
+            return -90;
+        if (value > 90)
+            return 90;
+        return value;
+    }
+
+    /**
+     * Returns a valid OSM longitude [-180,+180] for the given extended longitude value.
+     * For example, a value of -181 will return +179, a value of +181 will return -179. 
+     * @param lon A longitude value not restricted to the [-180,+180] range.
+     */
+    public static double toIntervalLon(double value) {
+        if (isValidLon(value)) {
+            return value;
+        } else {
+            int n = (int) (value + Math.signum(value)*180.0) / 360;
+            return value - n*360.0;
+        }
+    }
         
     /**
@@ -165 +187 @@
      */
     public boolean isWithin(Bounds b) {
-        return lat() >= b.getMin().lat() && lat() <= b.getMax().lat() && lon() > b.getMin().lon() && lon() < b.getMax().lon();
+        return b.contains(this);
     }