Changeset 11486 in josm

Timestamp:

2017-01-22T19:14:12+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14275 - robustness against invalid timestamps in GPX files

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (modified) (4 diffs)
• test/data/regress/14275 (added)
• test/data/regress/14275/1485101437.8189685.gpx (added)
• test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified) (1 diff)

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

@@ -37 +37 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -44 +45 @@
  */
 public abstract class ConvertToDataLayerAction<T extends Layer> extends AbstractAction {
+    /** source layer */
     protected final transient T layer;
 
+    /**
+     * Constructs a new {@code ConvertToDataLayerAction}
+     * @param layer source layer
+     */
     protected ConvertToDataLayerAction(final T layer) {
         super(tr("Convert to data layer"), ImageProvider.get("converttoosm"));
@@ -75 +81 @@
                         String timestr = p.getString(GpxConstants.PT_TIME);
                         if (timestr != null) {
-                            n.setTimestamp(DateUtils.fromString(timestr));
+                            try {
+                                n.setTimestamp(DateUtils.fromString(timestr));
+                            } catch (UncheckedParseException e) {
+                                Main.warn(e, false);
+                            }
                         }
                         ds.addPrimitive(n);
@@ -151 +161 @@
         }
         final DataSet ds = convert();
-        final OsmDataLayer layer = new OsmDataLayer(ds, tr("Converted from: {0}", this.layer.getName()), null);
-        if (this.layer.getAssociatedFile() != null) {
-            layer.setAssociatedFile(new File(this.layer.getAssociatedFile().getParentFile(), this.layer.getAssociatedFile().getName() + ".osm"));
+        final OsmDataLayer osmLayer = new OsmDataLayer(ds, tr("Converted from: {0}", layer.getName()), null);
+        if (layer.getAssociatedFile() != null) {
+            osmLayer.setAssociatedFile(new File(layer.getAssociatedFile().getParentFile(), layer.getAssociatedFile().getName() + ".osm"));
         }
-        layer.setUploadDiscouraged(true);
-        Main.getLayerManager().addLayer(layer);
-        Main.getLayerManager().removeLayer(this.layer);
+        osmLayer.setUploadDiscouraged(true);
+        Main.getLayerManager().addLayer(osmLayer);
+        Main.getLayerManager().removeLayer(layer);
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
 
 import org.junit.BeforeClass;
@@ -13 +16 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.GpxReaderTest;
+import org.xml.sax.SAXException;
 
 /**
@@ -40 +44 @@
                 osm.getNodes().iterator().next().getKeys());
     }
+
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/14275">#14275</a>
+     * @throws IOException if an error occurs during reading
+     * @throws SAXException if any XML error occurs
+     */
+    @Test
+    public void testTicket14275() throws IOException, SAXException {
+        assertNotNull(GpxReaderTest.parseGpxData(TestUtils.getRegressionDataFile(14275, "1485101437.8189685.gpx")));
+    }
 }

trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java

@@ -117 +117 @@
      */
     @Test
-    public void testFromDate() throws Exception {
+    public void testFromDate() {
         assertEquals("1970-01-01T00:00:00Z", DateUtils.fromDate(new Date(0)));
         assertEquals("1970-01-01T00:00:00.1Z", DateUtils.fromDate(new Date(100)));