Changeset 236 in josm for src/org

Timestamp:

2007-05-14T22:34:25+02:00 (18 years ago)

Author:

framm

Message:

Patch to allow reading of .gpx.gz files
Submitted by Shaun McDonald <shaunmcdonald131@…>
Closes #140

Location:

src/org/openstreetmap/josm/actions

Files:

• ExtensionFileFilter.java (modified) (1 diff)
• OpenAction.java (modified) (2 diffs)

src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -24 +24 @@
         public static ExtensionFileFilter[] filters = {
                 new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files (.osm .xml)")),
-                new ExtensionFileFilter("gpx", "gpx", tr("GPX Files (.gpx)")),
+                new ExtensionFileFilter("gpx,gpx.gz", "gpx", tr("GPX Files (.gpx .gpx.gz)")),
                 new ExtensionFileFilter("csv,txt", "csv", tr("CSV Files (.csv .txt)")),
         };

src/org/openstreetmap/josm/actions/OpenAction.java

@@ -12 +12 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.zip.GZIPInputStream;
 
 import javax.swing.JFileChooser;
@@ -62 +63 @@
                                 Collection<Marker> markerData = null;
                                 if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) {
-                                        RawGpsReader r = new RawGpsReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile());
+                                        RawGpsReader r = null;
+                                        // Check to see if we are opening a compressed file
+                                        if(file.getName().endsWith(".gpx.gz")) {
+                                                r = new RawGpsReader(new GZIPInputStream(new FileInputStream(file)), file.getAbsoluteFile().getParentFile());
+                                        } else {
+                                                r = new RawGpsReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile());
+                                        }
                                         gpsData = r.trackData;
                                         markerData = r.markerData;