Changeset 737 in josm for trunk

Timestamp:

2008-07-28T09:31:34+02:00 (16 years ago)

Author:

framm

Message:

• added NMEA suport, patch by egore@… and jennergruhle. closes #675. Note, NMEA is read but not internally converted into GPX structures yet.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

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

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

@@ -21 +21 @@
         public static final int OSM = 0;
         public static final int GPX = 1;
+        public static final int NMEA = 2;
         
         public static ExtensionFileFilter[] filters = {
                 new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files (.osm .xml)")),
                 new ExtensionFileFilter("gpx,gpx.gz", "gpx", tr("GPX Files (.gpx .gpx.gz)")),
+                new ExtensionFileFilter("nmea", "nmea", tr("NMEA-0183 Files (.nmea)")),
         };
 

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

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.io.GpxReader;
+import org.openstreetmap.josm.io.NmeaReader;
 import org.openstreetmap.josm.io.OsmReader;
-import org.openstreetmap.josm.io.GpxReader;
 import org.xml.sax.SAXException;
 
@@ -56 +57 @@
                         if (asGpxData(file.getName()))
                                 openFileAsGpx(file);
+                        else if (asNmeaData(file.getName()))
+                                openFileAsNmea(file);
                         else
                                 openAsData(file);
@@ -103 +106 @@
     }
 
+        private void openFileAsNmea(File file) throws IOException, FileNotFoundException {
+                String fn = file.getName();
+                if (ExtensionFileFilter.filters[ExtensionFileFilter.NMEA].acceptName(fn)) {
+                        NmeaReader r = new NmeaReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile());
+                        r.data.storageFile = file;
+                        GpxLayer gpxLayer = new GpxLayer(r.data, fn);
+                        Main.main.addLayer(gpxLayer);
+                        if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
+                                MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer);
+                                if (ml.data.size() > 0) {
+                                        Main.main.addLayer(ml);
+                                }
+                        }
+
+                } else {
+                        throw new IllegalStateException();
+                }
+    }
 
         private boolean asGpxData(String fn) {
@@ -108 +129 @@
         }
 
+        private boolean asNmeaData(String fn) {
+                return ExtensionFileFilter.filters[ExtensionFileFilter.NMEA].acceptName(fn);
+        }
+
 
 }