Changeset 7326 in josm for trunk/src/org/openstreetmap/josm/io/NMEAImporter.java

Timestamp:

2014-07-22T00:17:42+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10292 - allow to load a session with NMEA file + enhance reading/writing unit tests for sessions

File:

• trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (modified) (3 diffs)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.GpxImporter.GpxImporterData;
 
+/**
+ * File importer allowing to import NMEA-0183 files (*.nmea/nme/nma/log/txt files).
+ * @since 1637
+ */
 public class NMEAImporter extends FileImporter {
 
+    /**
+     * The NMEA file filter (*.nmea *.nme *.nma *.log *.txt files).
+     */
     public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
             "nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files") + " (*.nmea *.nme *.nma *.log *.txt)");
@@ -42 +50 @@
                 final GpxLayer gpxLayer = new GpxLayer(r.data, fn, true);
                 final File fileFinal = file;
-    
+
                 GuiHelper.runInEDT(new Runnable() {
                     @Override
@@ -88 +96 @@
         }
     }
+
+    public static GpxImporterData loadLayers(InputStream is, final File associatedFile,
+            final String gpxLayerName, String markerLayerName) throws IOException {
+        final NmeaReader r = new NmeaReader(is);
+        final boolean parsedProperly = r.getNumberOfCoordinates() > 0;
+        r.data.storageFile = associatedFile;
+        return GpxImporter.loadLayers(r.data, parsedProperly, gpxLayerName, markerLayerName);
+    }
 }