Changeset 8384 in josm for trunk/src/org/openstreetmap/josm/data/gpx

Timestamp:

2015-05-17T15:52:24+02:00 (9 years ago)

Author:

Don-vip

Message:

squid:S1244 - Floating point numbers should not be tested for equality

File:

• trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -211 +212 @@
     */
     public Date[] getMinMaxTimeForAllTracks() {
-        double min=1e100, max=-1e100, t;
+        double min=1e100;
+        double max=-1e100;
         double now = System.currentTimeMillis()/1000.0;
         for (GpxTrack trk: tracks) {
             for (GpxTrackSegment seg : trk.getSegments()) {
                 for (WayPoint pnt : seg.getWayPoints()) {
-                    t = pnt.time;
+                    double t = pnt.time;
                     if (t>0 && t<=now) {
                         if (t>max) max=t;
@@ -224 +226 @@
             }
         }
-        if (min==1e100 || max==-1e100) return null;
-        return new Date[]{new Date((long) (min * 1000)), new Date((long) (max * 1000)), };
+        if (Utils.equalsEpsilon(min,1e100) || Utils.equalsEpsilon(max,-1e100)) return new Date[0];
+        return new Date[]{new Date((long) (min * 1000)), new Date((long) (max * 1000))};
     }
 
@@ -293 +295 @@
                         double C = -A * rx - B * ry;
                         double RSsq = A * A + B * B;
-                        if (RSsq == 0.0) {
+                        if (Double.doubleToRawLongBits(RSsq) == 0) {
                             continue;
                         }