Changeset 14010 in josm for trunk/src/org/openstreetmap/josm/io/nmea/NmeaReader.java

Timestamp:

2018-07-07T14:09:37+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16471 - Support NMEA files when correlating images to a GPX track

File:

• trunk/src/org/openstreetmap/josm/io/nmea/NmeaReader.java (modified) (8 diffs)

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

@@ -14 +14 @@
 import java.util.Date;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Optional;
 
@@ -21 +22 @@
 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.io.IGpxReader;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.date.DateUtils;
+import org.xml.sax.SAXException;
 
 /**
@@ -40 +43 @@
  * @author cbrill
  */
-public class NmeaReader {
+public class NmeaReader implements IGpxReader {
 
     enum VTG {
@@ -129 +132 @@
     }
 
-    public GpxData data;
+    private final InputStream source;
+    GpxData data;
 
     private final SimpleDateFormat rmcTimeFmt = new SimpleDateFormat("ddMMyyHHmmss.SSS", Locale.ENGLISH);
@@ -171 +175 @@
      */
     public NmeaReader(InputStream source) throws IOException {
+        this.source = Objects.requireNonNull(source);
         rmcTimeFmt.setTimeZone(DateUtils.UTC);
         rmcTimeFmtStd.setTimeZone(DateUtils.UTC);
-
+    }
+
+    @Override
+    public boolean parse(boolean tryToFinish) throws SAXException, IOException {
         // create the data tree
         data = new GpxData();
@@ -184 +192 @@
             if (loopstartChar == -1)
                 //TODO tell user about the problem?
-                return;
+                return false;
             sb.append((char) loopstartChar);
             ps.pDate = "010100"; // TODO date problem
@@ -210 +218 @@
         } catch (IllegalDataException e) {
             Logging.warn(e);
-        }
+            return false;
+        }
+        return true;
     }
 
@@ -529 +539 @@
         return new LatLon(lat, lon);
     }
+
+    @Override
+    public GpxData getGpxData() {
+        return data;
+    }
 }