Changeset 14434 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-11-20T01:13:10+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #16995 - fix timestamp in GPX exports (patch by cmuelle8) + use Java 8 unsigned int API

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

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

@@ -781 +781 @@
      */
     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 time a timestamp value in milliseconds from the epoch.
      * @return {@code WayPoint} object
      * @since 13210
@@ -798 +798 @@
 
         try {
-            if (time > 0) {
-                wpt.put(GpxConstants.PT_TIME, DateUtils.fromTimestamp(time));
-                wpt.setTime(time);
+            if (time > Long.MIN_VALUE) {
+                wpt.setTimeInMillis(time);
             } 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(Integer.toUnsignedLong(n.getRawTimestamp()));
             }
         } catch (UncheckedParseException e) {