Changeset 14430 in josm for trunk

Timestamp:

2018-11-18T18:27:42+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17003 - catch UncheckedParseException when converting OSM data to GPX

File:

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

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

@@ -116 +116 @@
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -796 +797 @@
         addDoubleIfPresent(wpt, n, GpxConstants.PT_ELE);
 
-        if (time > 0) {
-            wpt.put(GpxConstants.PT_TIME, DateUtils.fromTimestamp(time));
-            wpt.setTime(time);
-        } else if (n.hasKey(GpxConstants.PT_TIME)) {
-            wpt.put(GpxConstants.PT_TIME, DateUtils.fromString(n.get(GpxConstants.PT_TIME)));
-            wpt.setTime();
-        } else if (!n.isTimestampEmpty()) {
-            wpt.put(GpxConstants.PT_TIME, DateUtils.fromTimestamp(n.getRawTimestamp()));
-            wpt.setTime();
+        try {
+            if (time > 0) {
+                wpt.put(GpxConstants.PT_TIME, DateUtils.fromTimestamp(time));
+                wpt.setTime(time);
+            } else if (n.hasKey(GpxConstants.PT_TIME)) {
+                wpt.put(GpxConstants.PT_TIME, DateUtils.fromString(n.get(GpxConstants.PT_TIME)));
+                wpt.setTime();
+            } else if (!n.isTimestampEmpty()) {
+                wpt.put(GpxConstants.PT_TIME, DateUtils.fromTimestamp(n.getRawTimestamp()));
+                wpt.setTime();
+            }
+        } catch (UncheckedParseException e) {
+            Logging.error(e);
         }