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

Timestamp:

2018-11-20T01:13:10+01:00 (7 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/data/gpx/WayPoint.java (modified) (3 diffs)

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

@@ -129 +129 @@
 
     /**
-     * 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
@@ -140 +140 @@
 
     /**
-     * Convert the time stamp of the waypoint into seconds from the epoch
-     */
+     * 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();
@@ -147 +150 @@
 
     /**
-     * Set the the time stamp of the waypoint into seconds from the epoch,
-     * @param time millisecond 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(long time) {
-        this.time = time / 1000.;
+    public void setTime(long ts) {
+        this.time = ts;
+        this.attr.put(PT_TIME, DateUtils.fromTimestamp(ts));
+    }
+
+    /**
+     * Sets the {@link #time} field as well as the {@link #PT_TIME} attribute to the specified time.
+     *
+     * @param ts milliseconds from the epoch
+     * @since 14434
+     */
+    public void setTimeInMillis(long ts) {
+        this.time = ts / 1000.;
+        this.attr.put(PT_TIME, DateUtils.fromTimestampInMillis(ts));
     }