Changeset 4181 in josm for trunk/src/org/openstreetmap/josm/data/Bounds.java

Timestamp:

2011-06-28T18:50:13+02:00 (13 years ago)

Author:

jttt

Message:

Better fix for #6519

File:

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

trunk/src/org/openstreetmap/josm/data/Bounds.java

@@ -223 +223 @@
     }
 
-    private double toInterval(double value, double min, double max) {
+    private double toIntervalLat(double value, double min, double max) {
         if (value < min)
             return min;
@@ -231 +231 @@
     }
 
+    private double toIntervalLon(double value) {
+        if (value < -180 || value > 180) {
+            value = (value + 180) % 360;
+            if (value < 0) {
+                value += 360;
+            }
+            return value - 180;
+        } else
+            return value;
+    }
+
     public void normalize() {
-        minLat = toInterval(minLat, -90, 90);
-        maxLat = toInterval(maxLat, -90, 90);
-        minLon = toInterval(minLon, -180, 180);
-        maxLon = toInterval(maxLon, -180, 180);
+        minLat = toIntervalLat(minLat, -90, 90);
+        maxLat = toIntervalLat(maxLat, -90, 90);
+        minLon = toIntervalLon(minLon);
+        maxLon = toIntervalLon(maxLon);
     }