Changeset 14010 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

Timestamp:

2018-07-07T14:09:37+02:00 (8 months ago)

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (8 diffs)

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());
-            }
-        }
     }