Changeset 189 in josm for src/org/openstreetmap/josm/actions/OpenAction.java

Timestamp:

2007-01-06T15:10:37+01:00 (17 years ago)

Author:

imi

Message:

• added MarkerLayer (thanks Frederik)

File:

• src/org/openstreetmap/josm/actions/OpenAction.java (modified) (2 diffs)

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.MarkerLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer;
+import org.openstreetmap.josm.gui.layer.MarkerLayer.Marker;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
 import org.openstreetmap.josm.io.OsmReader;
@@ -57 +59 @@
                 try {
                         if (asRawData(fn)) {
-                                Collection<Collection<GpsPoint>> data;
+                                Collection<Collection<GpsPoint>> gpsData = null;
+                                Collection<Marker> markerData = null;
                                 if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) {
-                                        data = RawGpsReader.parse(new FileInputStream(file));
+                                        RawGpsReader r = new RawGpsReader(new FileInputStream(file));
+                                        gpsData = r.trackData;
+                                        markerData = r.markerData;
                                 } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) {
-                                        data = new LinkedList<Collection<GpsPoint>>();
-                                        data.add(new RawCsvReader(new FileReader(file)).parse());
+                                        gpsData = new LinkedList<Collection<GpsPoint>>();
+                                        gpsData.add(new RawCsvReader(new FileReader(file)).parse());
                                 } else
                                         throw new IllegalStateException();
-                                Main.main.addLayer(new RawGpsLayer(data, file.getName(), file));
+                                if ((gpsData != null) && (!gpsData.isEmpty()))
+                                        Main.main.addLayer(new RawGpsLayer(gpsData, tr("Tracks from {0}", file.getName()), file));
+                                if ((markerData != null) && (!markerData.isEmpty()))
+                                        Main.main.addLayer(new MarkerLayer(markerData, tr ("Markers from {0}", file.getName()), file));
+                                
                         } else {
                                 DataSet dataSet;