Changeset 14448 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-11-25T12:55:56+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16995 - proper fix to timestamp formatting in GPX files, does not append trailing subsecond zeroes (patch by cmuelle8)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/gpx/ConvertFromGpxLayerAction.java (modified) (2 diffs)
• io/GpxWriter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromGpxLayerAction.java

@@ -43 +43 @@
 
     private static final String GPX_SETTING = "gpx.convert-tags";
-    private final DateFormat timeFormatter = DateUtils.getGpxFormat();
 
     /**
@@ -83 +82 @@
                             Date date = (Date) obj;
                             if (!none) { //... but the tag will only be set when required
-                                n.put(key, timeFormatter.format(date));
+                                n.put(key, DateUtils.fromDate(date));
                             }
                             n.setTimestamp(date);

trunk/src/org/openstreetmap/josm/io/GpxWriter.java

@@ -37 +37 @@
  */
 public class GpxWriter extends XmlWriter implements GpxConstants {
-
-    private final DateFormat gpxFormat = DateUtils.getGpxFormat();
 
     /**
@@ -121 +119 @@
                     Object val = obj.get(key);
                     if (val instanceof Date) {
-                        simpleTag(key, gpxFormat.format(val));
+                        simpleTag(key, DateUtils.fromDate((Date) val));
                     } else if (val instanceof Number) {
                         simpleTag(key, val.toString());