Changeset 6204 in josm for trunk/src/org

Timestamp:

2013-08-28T04:12:02+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9024 - fix problems introduced in r6203

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Bounds.java (modified) (1 diff)
• osm/BBox.java (modified) (1 diff)

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

@@ -414 +414 @@
      */
     public boolean isCollapsed() {
-        return (minLat == maxLat) && (minLon == maxLon);
+        return Double.doubleToLongBits(minLat) == Double.doubleToLongBits(maxLat) 
+            && Double.doubleToLongBits(minLon) == Double.doubleToLongBits(maxLon);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/BBox.java

@@ -115 +115 @@
      */
     public void add(double x, double y) {
-        
-        if (x < xmin) {
-            xmin = x;
-        } else if (x > xmax) {
-            xmax = x;
-        }
-        
-        if (y < ymin) {
-            ymin = y;
-        } else if (y > ymax) {
-            ymax = y;
-        }
-
+        xmin = Math.min(xmin, x);
+        xmax = Math.max(xmax, x);
+        ymin = Math.min(ymin, y);
+        ymax = Math.max(ymax, y);
         sanity();
     }