Changeset 14456 in josm for trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

Timestamp:

2018-11-27T21:40:10+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #16995 - de-duplicate storage of timestamp within WayPoint and refactor some methods, added documentation, added some robustness against legacy code (will also log a warning if detected). Patch by cmuelle8, modified

File:

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

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

@@ -9 +9 @@
 import java.util.Collections;
 import java.util.Date;
-import java.util.DoubleSummaryStatistics;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.LongSummaryStatistics;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -175 +175 @@
                 Date prevWpTime = null;
                 for (WayPoint wp : wpsOld) {
-                    Date wpTime = wp.setTimeFromAttribute();
+                    Date wpTime = wp.getDate();
                     boolean overlap = false;
                     if (wpTime != null) {
@@ -267 +267 @@
 
         GpxTrackSegmentSpan(WayPoint a, WayPoint b) {
-            Date at = a.getTime();
-            Date bt = b.getTime();
+            Date at = a.getDate();
+            Date bt = b.getDate();
             inv = bt.before(at);
             if (inv) {
@@ -324 +324 @@
             List<WayPoint> wps = new ArrayList<>(seg.getWayPoints());
             for (int i = forward ? 0 : wps.size() - 1; i >= 0 && i < wps.size(); i += forward ? 1 : -1) {
-                if (wps.get(i).setTimeFromAttribute() != null) {
+                if (wps.get(i).hasDate()) {
                     return wps.get(i);
                 }
@@ -691 +691 @@
      */
     public static Date[] getMinMaxTimeForTrack(GpxTrack trk) {
-        final DoubleSummaryStatistics statistics = trk.getSegments().stream()
+        final LongSummaryStatistics statistics = trk.getSegments().stream()
                 .flatMap(seg -> seg.getWayPoints().stream())
-                .mapToDouble(pnt -> pnt.time)
+                .mapToLong(pnt -> pnt.getTimeInMillis())
                 .summaryStatistics();
         return statistics.getCount() == 0
                 ? null
-                : new Date[]{new Date((long) (statistics.getMin() * 1000)), new Date((long) (statistics.getMax() * 1000))};
+                : new Date[]{new Date(statistics.getMin()), new Date(statistics.getMax())};
     }
 
@@ -708 +708 @@
     */
     public synchronized Date[] getMinMaxTimeForAllTracks() {
-        double now = System.currentTimeMillis() / 1000.0;
-        final DoubleSummaryStatistics statistics = tracks.stream()
+        long now = System.currentTimeMillis();
+        final LongSummaryStatistics statistics = tracks.stream()
                 .flatMap(trk -> trk.getSegments().stream())
                 .flatMap(seg -> seg.getWayPoints().stream())
-                .mapToDouble(pnt -> pnt.time)
+                .mapToLong(pnt -> pnt.getTimeInMillis())
                 .filter(t -> t > 0 && t <= now)
                 .summaryStatistics();
         return statistics.getCount() == 0
                 ? new Date[0]
-                : new Date[]{new Date((long) (statistics.getMin() * 1000)), new Date((long) (statistics.getMax() * 1000))};
+                : new Date[]{new Date(statistics.getMin()), new Date(statistics.getMax())};
     }
 
@@ -755 +755 @@
         double pnminsq = tolerance * tolerance;
         EastNorth bestEN = null;
-        double bestTime = 0.0;
+        double bestTime = Double.NaN;
         double px = p.east();
         double py = p.north();
@@ -774 +774 @@
                             pnminsq = pRsq;
                             bestEN = en;
-                            bestTime = r.time;
+                            if (r.hasDate()) {
+                                bestTime = r.getTime();
+                            }
                         }
                     } else {
@@ -800 +802 @@
                                 double ny = ry + rnoverRS * a;
                                 bestEN = new EastNorth(nx, ny);
-                                bestTime = r.time + rnoverRS * (wpSeg.time - r.time);
+                                if (r.hasDate() && wpSeg.hasDate()) {
+                                    bestTime = r.getTime() + rnoverRS * (wpSeg.getTime() - r.getTime());
+                                }
                                 pnminsq = pnsq;
                             }
@@ -820 +824 @@
                         pnminsq = prsq;
                         bestEN = c;
-                        bestTime = r.time;
+                        if (r.hasDate()) {
+                            bestTime = r.getTime();
+                        }
                     }
                 }
@@ -828 +834 @@
             return null;
         WayPoint best = new WayPoint(ProjectionRegistry.getProjection().eastNorth2latlon(bestEN));
-        best.time = bestTime;
+        if (!Double.isNaN(bestTime)) {
+            best.setTimeInMillis((long) (bestTime * 1000));
+        }
         return best;
     }