Changeset 14010 in josm for trunk/src

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/importexport/NMEAImporter.java (modified) (4 diffs)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (8 diffs)
• io/GpxReader.java (modified) (3 diffs)
• io/IGpxReader.java (added)
• io/nmea/NmeaReader.java (modified) (8 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;
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -23 +23 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Files;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -38 +38 @@
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
-import java.util.zip.GZIPInputStream;
 
 import javax.swing.AbstractAction;
@@ -60 +59 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.filechooser.FileFilter;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.DiskAccessAction;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -72 +71 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.io.importexport.GpxImporter;
 import org.openstreetmap.josm.gui.io.importexport.JpgImporter;
+import org.openstreetmap.josm.gui.io.importexport.NMEAImporter;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
+import org.openstreetmap.josm.gui.widgets.FileChooserManager;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.GpxReader;
+import org.openstreetmap.josm.io.IGpxReader;
+import org.openstreetmap.josm.io.nmea.NmeaReader;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
@@ -85 +90 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 import org.xml.sax.SAXException;
@@ -251 +255 @@
 
         @Override
-        public void actionPerformed(ActionEvent arg0) {
-            FileFilter filter = new FileFilter() {
-                @Override
-                public boolean accept(File f) {
-                    return f.isDirectory() || Utils.hasExtension(f, "gpx", "gpx.gz");
-                }
-
-                @Override
-                public String getDescription() {
-                    return tr("GPX Files (*.gpx *.gpx.gz)");
-                }
-            };
-            AbstractFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null, filter, JFileChooser.FILES_ONLY, null);
+        public void actionPerformed(ActionEvent e) {
+            ExtensionFileFilter gpxFilter = GpxImporter.getFileFilter();
+            AbstractFileChooser fc = new FileChooserManager(true, null).createFileChooser(false, null,
+                    Arrays.asList(gpxFilter, NMEAImporter.FILE_FILTER), gpxFilter, JFileChooser.FILES_ONLY).openFileChooser();
             if (fc == null)
                 return;
@@ -287 +282 @@
                 }
                 GpxData data = null;
-                try (InputStream iStream = createInputStream(sel)) {
-                    GpxReader reader = new GpxReader(iStream);
+                try (InputStream iStream = Compression.getUncompressedFileInputStream(sel)) {
+                    IGpxReader reader = gpxFilter.accept(sel) ? new GpxReader(iStream) : new NmeaReader(iStream);
                     reader.parse(false);
                     data = reader.getGpxData();
@@ -327 +322 @@
             }
         }
-
-        private InputStream createInputStream(File sel) throws IOException {
-            if (Utils.hasExtension(sel, "gpx.gz")) {
-                return new GZIPInputStream(Files.newInputStream(sel.toPath()));
-            } else {
-                return Files.newInputStream(sel.toPath());
-            }
-        }
     }
 

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

@@ -42 +42 @@
  * @author imi, ramack
  */
-public class GpxReader implements GpxConstants {
+public class GpxReader implements GpxConstants, IGpxReader {
 
     private enum State {
@@ -579 +579 @@
      * @throws IOException if any I/O error occurs
      */
+    @Override
     public boolean parse(boolean tryToFinish) throws SAXException, IOException {
         Parser parser = new Parser();
@@ -604 +605 @@
     }
 
-    /**
-     * Replies the GPX data.
-     * @return The GPX data
-     */
+    @Override
     public GpxData getGpxData() {
         return gpxData;

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;
+    }
 }