Changeset 12422 in josm

Timestamp:

2017-06-22T01:07:31+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14924 - fix NPE when reading NMEA files starting with a (0,0) coordinate followed by a VTG sentence

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/nmea/NmeaReader.java (modified) (2 diffs)
• test/data/regress/14924 (added)
• test/data/regress/14924/input.gpx (added)
• test/data/regress/14924/input.nmea (added)
• test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/nmea/NmeaReader.java

@@ -342 +342 @@
                     // other values than (T)rue are ignored
                     accu = e[VTG.COURSE.position];
-                    if (!accu.isEmpty()) {
+                    if (!accu.isEmpty() && currentwp != null) {
                         Double.parseDouble(accu);
                         currentwp.put("course", accu);
@@ -351 +351 @@
                 if (accu.startsWith("K")) {
                     accu = e[VTG.SPEED_KMH.position];
-                    if (!accu.isEmpty()) {
+                    if (!accu.isEmpty() && currentwp != null) {
                         double speed = Double.parseDouble(accu);
                         speed /= 3.6; // speed in m/s

trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java

@@ -76 +76 @@
         assertEquals(numCoor, in.getNumberOfCoordinates());
         assertEquals(0, in.getParserMalformed());
-        assertEquals(in.data.dataSources, gpx.dataSources);
+        assertEquals(gpx.dataSources, in.data.dataSources);
         assertEquals(1, gpx.tracks.size());
         assertEquals(1, in.data.tracks.size());
@@ -82 +82 @@
         GpxTrack nmeaTrack = in.data.tracks.iterator().next();
         assertEquals(gpxTrack.getBounds(), nmeaTrack.getBounds());
-        assertEquals(1, gpxTrack.getSegments().size());
-        assertEquals(1, nmeaTrack.getSegments().size());
-        GpxTrackSegment gpxSeg = gpxTrack.getSegments().iterator().next();
-        GpxTrackSegment nmeaSeg = nmeaTrack.getSegments().iterator().next();
-        assertEquals(gpxSeg.getBounds(), nmeaSeg.getBounds());
-        assertEquals(numCoor, gpxSeg.getWayPoints().size());
-        assertEquals(numCoor, nmeaSeg.getWayPoints().size());
-        WayPoint gpxWpt = gpxSeg.getWayPoints().iterator().next();
-        WayPoint nmeaWpt = nmeaSeg.getWayPoints().iterator().next();
-        assertEquals(gpxWpt.getCoor().getRoundedToOsmPrecision(), nmeaWpt.getCoor().getRoundedToOsmPrecision());
+        int nTracks = gpxTrack.getSegments().size();
+        assertEquals(nTracks, nmeaTrack.getSegments().size());
+        if (nTracks > 0) {
+            GpxTrackSegment gpxSeg = gpxTrack.getSegments().iterator().next();
+            GpxTrackSegment nmeaSeg = nmeaTrack.getSegments().iterator().next();
+            assertEquals(gpxSeg.getBounds(), nmeaSeg.getBounds());
+            assertEquals(numCoor, gpxSeg.getWayPoints().size());
+            assertEquals(numCoor, nmeaSeg.getWayPoints().size());
+            WayPoint gpxWpt = gpxSeg.getWayPoints().iterator().next();
+            WayPoint nmeaWpt = nmeaSeg.getWayPoints().iterator().next();
+            assertEquals(gpxWpt.getCoor().getRoundedToOsmPrecision(), nmeaWpt.getCoor().getRoundedToOsmPrecision());
+        }
     }
 
@@ -133 +135 @@
         compareWithReference(2147, "WG20080203171807.log", 487);
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14924">Bug #14924</a>.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testTicket14924() throws Exception {
+        compareWithReference(14924, "input", 0);
+    }
 }