Changeset 34749 in osm for applications/editors/josm

Timestamp:

2018-11-28T22:59:45+01:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14456

Location:

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io

Files:

• TangoGPS.java (modified) (2 diffs)
• Tcx.java (modified) (1 diff)

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java

@@ -29 +29 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -67 +68 @@
                                 parseLatLon(lineElements));
                         currentWayPoint.attr.put("ele", lineElements[2]);
-                        currentWayPoint.attr.put("time", lineElements[6]);
-                        currentWayPoint.setTime();
+                        currentWayPoint.setTimeInMillis(DateUtils.tsFromString(lineElements[6]));
                         currentTrackSeg.add(currentWayPoint);
                         imported++;

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java

@@ -159 +159 @@
                                         if (waypt != null) {
                                             if (startTime != null) {
-                                                waypt.attr.put("name", "LAP"
-                                                               + (++lap));
+                                                waypt.attr.put("name", "LAP" + ++lap);
                                                 gpxData.waypoints.add(waypt);
                                                 startTime = null;