Changeset 14010 in josm for trunk/src/org/openstreetmap/josm/gui/io

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/gui/io/importexport/NMEAImporter.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/io/importexport/NMEAImporter.java

@@ -24 +24 @@
 import org.openstreetmap.josm.io.nmea.NmeaReader;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.xml.sax.SAXException;
 
 /**
@@ -48 +49 @@
         final String fn = file.getName();
         try (InputStream fis = Compression.getUncompressedFileInputStream(file)) {
-            final NmeaReader r = new NmeaReader(fis);
+            final NmeaReader r = buildAndParse(fis);
             if (r.getNumberOfCoordinates() > 0) {
-                r.data.storageFile = file;
-                final GpxLayer gpxLayer = new GpxLayer(r.data, fn, true);
+                r.getGpxData().storageFile = file;
+                final GpxLayer gpxLayer = new GpxLayer(r.getGpxData(), fn, true);
                 final File fileFinal = file;
 
@@ -57 +58 @@
                     MainApplication.getLayerManager().addLayer(gpxLayer);
                     if (Config.getPref().getBoolean("marker.makeautomarkers", true)) {
-                        MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), fileFinal, gpxLayer);
+                        MarkerLayer ml = new MarkerLayer(r.getGpxData(), tr("Markers from {0}", fn), fileFinal, gpxLayer);
                         if (!ml.data.isEmpty()) {
                             MainApplication.getLayerManager().addLayer(ml);
@@ -103 +104 @@
     public static GpxImporterData loadLayers(InputStream is, final File associatedFile,
             final String gpxLayerName, String markerLayerName) throws IOException {
-        final NmeaReader r = new NmeaReader(is);
+        final NmeaReader r = buildAndParse(is);
         final boolean parsedProperly = r.getNumberOfCoordinates() > 0;
-        r.data.storageFile = associatedFile;
-        return GpxImporter.loadLayers(r.data, parsedProperly, gpxLayerName, markerLayerName);
+        r.getGpxData().storageFile = associatedFile;
+        return GpxImporter.loadLayers(r.getGpxData(), parsedProperly, gpxLayerName, markerLayerName);
+    }
+
+    static NmeaReader buildAndParse(InputStream fis) throws IOException {
+        final NmeaReader r = new NmeaReader(fis);
+        try {
+            r.parse(true);
+        } catch (SAXException e) {
+            throw new IOException(e);
+        }
+        return r;
     }
 }