Ticket #16995: josm-ticket-16995-corrupt-timestamps-when-using-ExportRelationToGpxAction-fix__without-y2038-fix.patch

src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java

@@ -20 +20 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
+import java.util.concurrent.TimeUnit;
 
 import org.openstreetmap.josm.actions.GpxExportAction;
 import org.openstreetmap.josm.actions.IPrimitiveAction;
@@ -173 +174 @@
 
         GpxData gpxData = new GpxData();
         String layerName = " (GPX export)";
-        long time = System.currentTimeMillis()-24*3600*1000;
+        long time = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()) - 24*3600;
 
         if (!flat.isEmpty()) {
             Map<String, Object> trkAttr = new HashMap<>();
@@ -196 +197 @@
                         if (trkAttr.isEmpty()) {
                             Relation r = Way.getParentRelations(Arrays.asList(flat.get(i).getWay()))
                                     .stream().filter(relsFound::contains).findFirst().orElseGet(null);
-                            if (r != null)
+                            if (r != null) {
                                 trkAttr.put("name", r.getName() != null ? r.getName() : r.getId());
+                                trkAttr.put("desc", tr("based on osm route relation data, timestamps are synthetic"));
+                            }
                             GpxData.ensureUniqueName(trkAttr, names);
                         }
                         List<Node> ln = flat.get(i).getWay().getNodes();
                         if (wct.get(i).direction == WayConnectionType.Direction.BACKWARD)
                             Collections.reverse(ln);
                         for (Node n: ln) {
-                            trkseg.add(OsmDataLayer.nodeToWayPoint(n, time));
-                            time += 1000;
+                            trkseg.add(OsmDataLayer.nodeToWayPoint(n, TimeUnit.SECONDS.toMillis(time)));
+                            time += 1;
                         }
                     }
                 }

src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -128 +128 @@
     }
 
     /**
-     * Sets the {@link #time} field as well as the {@link #PT_TIME} attribute to the specified time
+     * Sets the {@link #time} field as well as the {@link #PT_TIME} attribute to the specified time.
      *
      * @param time the time to set
      * @since 9383
@@ -139 +139 @@
     }
 
     /**
-     * Convert the time stamp of the waypoint into seconds from the epoch
+     * Sets the {@link #time} field as well as the {@link #PT_TIME} attribute to the specified time.
+     *
+     * @param ts seconds from the epoch
+     * @since 13210
      */
-    public void setTime() {
-        setTimeFromAttribute();
+    public void setTime(long ts) {
+        this.time = ts;
+        this.attr.put(PT_TIME, DateUtils.fromTimestamp(ts));
     }
 
     /**
-     * Set the the time stamp of the waypoint into seconds from the epoch,
-     * @param time millisecond from the epoch
-     * @since 13210
+     * Sets the {@link #time} field as well as the {@link #PT_TIME} attribute to the specified time.
+     *
+     * @param ts milliseconds from the epoch
+     * @since xxx
      */
-    public void setTime(long time) {
-        this.time = time / 1000.;
+    public void setTimeInMillis(long ts) {
+        this.time = ts / 1000.;
+        this.attr.put(PT_TIME, DateUtils.fromTimestampInMillis(ts));
+    }
+
+    /**
+     * Convert the time stamp of the waypoint into seconds from the epoch.
+     *
+     * @deprecated call {@link #setTimeFromAttribute()} directly if you need this
+     */
+    @Deprecated
+    public void setTime() {
+        setTimeFromAttribute();
     }
 
     /**

src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -192 +192 @@
      */
     protected int changesetId;
 
+    /**
+     * A time value, measured in seconds from the epoch, or in other words,
+     * a number of seconds that have passed since 1970-01-01T00:00:00Z
+     */
     protected int timestamp;
 
     /**

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -779 +779 @@
      * @since 13210
      */
     public static WayPoint nodeToWayPoint(Node n) {
-        return nodeToWayPoint(n, 0);
+        return nodeToWayPoint(n, Long.MIN_VALUE);
     }
 
     /**
      * @param n the {@code Node} to convert
-     * @param time a time value in milliseconds from the epoch.
+     * @param ts a timestamp value, in milliseconds from the epoch
      * @return {@code WayPoint} object
      * @since 13210
      */
-    public static WayPoint nodeToWayPoint(Node n, long time) {
+    public static WayPoint nodeToWayPoint(Node n, long ts) {
         WayPoint wpt = new WayPoint(n.getCoor());
 
         // Position info
 
         addDoubleIfPresent(wpt, n, GpxConstants.PT_ELE);
 
-        if (time > 0) {
-            wpt.put(GpxConstants.PT_TIME, DateUtils.fromTimestamp(time));
-            wpt.setTime(time);
+        if (ts != Long.MIN_VALUE) {
+            wpt.setTimeInMillis(ts);
         } else if (n.hasKey(GpxConstants.PT_TIME)) {
-            wpt.put(GpxConstants.PT_TIME, DateUtils.fromString(n.get(GpxConstants.PT_TIME)));
-            wpt.setTime();
+            wpt.setTime(DateUtils.fromString(n.get(GpxConstants.PT_TIME)));
         } else if (!n.isTimestampEmpty()) {
-            wpt.put(GpxConstants.PT_TIME, DateUtils.fromTimestamp(n.getRawTimestamp()));
-            wpt.setTime();
+            wpt.setTime(n.getRawTimestamp());
         }
 
         addDoubleIfPresent(wpt, n, GpxConstants.PT_MAGVAR);

src/org/openstreetmap/josm/io/GpxReader.java

@@ -444 +444 @@
                 case "cmt":
                 case "desc":
                     currentWayPoint.put(localName, accumulator.toString());
-                    currentWayPoint.setTime();
+                    currentWayPoint.setTimeFromAttribute();
                     break;
                 case "rtept":
                     currentState = states.pop();

src/org/openstreetmap/josm/io/nmea/NmeaReader.java

@@ -524 +524 @@
             ps.pDate = currentDate;
             if (ps.pWp != currentwp) {
                 if (ps.pWp != null) {
-                    ps.pWp.setTime();
+                    ps.pWp.setTimeFromAttribute();
                 }
                 ps.pWp = currentwp;
                 ps.waypoints.add(currentwp);

src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -152 +152 @@
      * @return The formatted date
      * @since 14055
      */
-    public static synchronized String fromTimestamp(long timestamp) {
-        final ZonedDateTime temporal = Instant.ofEpochMilli(TimeUnit.SECONDS.toMillis(timestamp)).atZone(ZoneOffset.UTC);
+    public static String fromTimestamp(long timestamp) {
+        return fromTimestampInMillis(TimeUnit.SECONDS.toMillis(timestamp));
+    }
+
+    /**
+     * Formats a date to the XML UTC format regardless of current locale.
+     * @param timestamp number of milliseconds since the epoch
+     * @return The formatted date
+     * @since xxx
+     */
+    public static synchronized String fromTimestampInMillis(long timestamp) {
+        final ZonedDateTime temporal = Instant.ofEpochMilli(timestamp).atZone(ZoneOffset.UTC);
         return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(temporal);
     }