Changeset 189 in josm for src/org/openstreetmap

Timestamp:

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

Author:

imi

Message:

• added MarkerLayer (thanks Frederik)

Location:

src/org/openstreetmap/josm

Files:

• actions/OpenAction.java (modified) (2 diffs)
• gui/layer/MarkerLayer.java (added)
• io/BoundingBoxDownloader.java (modified) (1 diff)
• io/RawGpsReader.java (modified) (8 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;

src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -48 +48 @@
                         if (in == null)
                                 break;
-                        Collection<Collection<GpsPoint>> allWays = RawGpsReader.parse(in);
+                        // Use only track points, since the server mix everything together 
+                        Collection<Collection<GpsPoint>> allWays = new RawGpsReader(in).trackData;
+
                         boolean foundSomething = false;
                         for (Collection<GpsPoint> t : allWays) {

src/org/openstreetmap/josm/io/RawGpsReader.java

@@ -6 +6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -11 +12 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.layer.MarkerLayer.Marker;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
 import org.xml.sax.Attributes;
@@ -24 +26 @@
 public class RawGpsReader {
 
-        private static class Parser extends MinML2 {
+        /**
+         * Hold the resulting gps data (tracks and their track points)
+         */
+        public Collection<Collection<GpsPoint>> trackData = new LinkedList<Collection<GpsPoint>>();
+
+        /**
+         * Hold the waypoints of the gps data.
+         */
+        public Collection<Marker> markerData = new ArrayList<Marker>();
+
+        private class Parser extends MinML2 {
                 /**
                  * Current track to be read. The last entry is the current trkpt.
@@ -30 +42 @@
                  */
                 private Collection<GpsPoint> current = new LinkedList<GpsPoint>();
-                public Collection<Collection<GpsPoint>> data = new LinkedList<Collection<GpsPoint>>();
                 private LatLon currentLatLon;
                 private String currentTime = "";
+                private String currentName = "";
                 private Stack<String> tags = new Stack<String>();
 
@@ -50 +62 @@
                 }
                 currentTime = "";
+                currentName = "";
                         }
                         tags.push(qName);
@@ -55 +68 @@
 
                 @Override public void characters(char[] ch, int start, int length) {
-                        if (tags.peek().equals("time")) {
-                                String time = tags.pop();
+                        String peek = tags.peek();
+                        if (peek.equals("time") || peek.equals("name")) {
+                                String tag = tags.pop();
                                 if (tags.empty() || (!tags.peek().equals("wpt") && !tags.peek().equals("trkpt"))) {
-                                        tags.push(time);
+                                        tags.push(tag);
                                         return;
                                 }
-                                String ct = new String(ch, start, length);
-                                currentTime += ct;
-                                tags.push(time);
+                                String contents = new String(ch, start, length);
+                                if (peek.equals("time")) currentTime += contents; else currentName += contents;
+                                tags.push(tag);
                         }
                 }
 
                 @Override public void endElement(String namespaceURI, String localName, String qName) {
-                        if (qName.equals("wpt") || qName.equals("trkpt")) {
+                        if (qName.equals("trkpt")) {
                                 current.add(new GpsPoint(currentLatLon, currentTime));
                                 currentTime = "";
+                                currentName = "";
+                        } else if (qName.equals("wpt")) {
+                                markerData.add(new Marker(currentLatLon, currentName, null));
+                                currentTime = "";
+                                currentName = "";
                         } else if (qName.equals("trkseg") || qName.equals("trk") || qName.equals("gpx")) {
                                 newTrack();
                                 currentTime = "";
+                                currentName = "";
                         }
                         tags.pop();
@@ -80 +100 @@
                 private void newTrack() {
                         if (!current.isEmpty()) {
-                                data.add(current);
+                                trackData.add(current);
                                 current = new LinkedList<GpsPoint>();
                         }
@@ -86 +106 @@
         }
 
+
         /**
-         * Parse and return the read data
+         * Parse the input stream and store the result in trackData and markerData 
          */
-        public static Collection<Collection<GpsPoint>> parse(InputStream source) throws SAXException, IOException {
+        public RawGpsReader(InputStream source) throws SAXException, IOException {
                 Parser parser = new Parser();
                 parser.parse(new InputStreamReader(source, "UTF-8"));
-                return parser.data;
         }
 }