Changeset 17 in josm for src/org/openstreetmap/josm/io/GpxReader.java

Timestamp:

2005-10-09T04:14:40+02:00 (19 years ago)

Author:

imi

Message:

• added Layer support
• added support for raw GPS data
• fixed tooltips
• added options for loading gpx files

File:

• src/org/openstreetmap/josm/io/GpxReader.java (modified) (7 diffs)

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

@@ -40 +40 @@
          */
         public Reader source;
+        /**
+         * If <code>true</code>, only nodes and tracks are imported (but no key/value
+         * pairs). That is to support background gps information as an hint for 
+         * real OSM data.
+         */
+        private final boolean rawGps;
         
         /**
          * Construct a parser from a specific data source.
          * @param source The data source, as example a FileReader to read from a file.
-         */
-        public GpxReader(Reader source) {
+         * @param rawGps Whether the gpx file describes raw gps data. Only very few
+         *              information (only nodes and line segments) imported for raw gps to 
+         *              save memory.
+         */
+        public GpxReader(Reader source, boolean rawGps) {
                 this.source = source;
+                this.rawGps = rawGps;
         }
         
@@ -56 +66 @@
                         final SAXBuilder builder = new SAXBuilder();
                         Element root = builder.build(source).getRootElement();
-                        System.out.println(root.getNamespacePrefix());
                         
                         // HACK, since the osm server seem to not provide a namespace.
@@ -85 +94 @@
                         Float.parseFloat(e.getAttributeValue("lat")),
                         Float.parseFloat(e.getAttributeValue("lon")));
+                
+                if (rawGps)
+                        return data;
+                
                 for (Object o : e.getChildren()) {
                         Element child = (Element)o;
@@ -126 +139 @@
                 for (Object o : e.getChildren()) {
                         Element child = (Element)o;
-                        if (child.getName().equals("extensions"))
-                                parseKeyValueExtensions(track, child);
-                        else if (child.getName().equals("link"))
-                                parseKeyValueLink(track, child);
-                        else if (child.getName().equals("trkseg")) {
+
+                        if (child.getName().equals("trkseg")) {
                                 Node start = null;
                                 for (Object w : child.getChildren("trkpt", GPX)) {
@@ -139 +149 @@
                                         else {
                                                 LineSegment lineSegment = new LineSegment(start, node);
-                                                parseKeyValueExtensions(lineSegment, ((Element)w).getChild("extensions", GPX));
+                                                if (!rawGps)
+                                                        parseKeyValueExtensions(lineSegment, ((Element)w).getChild("extensions", GPX));
                                                 track.add(lineSegment);
                                                 start = null;
                                         }
                                 }
-                        } else
+                        }
+                        
+                        if (rawGps)
+                                continue;
+                        
+                        if (child.getName().equals("extensions"))
+                                parseKeyValueExtensions(track, child);
+                        else if (child.getName().equals("link"))
+                                parseKeyValueLink(track, child);
+                        else
                                 parseKeyValueTag(track, child);
                 }
@@ -156 +176 @@
          * to the node in the list (either the new added or the old found).
          * 
+         * If reading raw gps data, mergeNodes are always on (To save memory. You
+         * can't edit raw gps nodes anyway.)
+         * 
          * @param data The DataSet to add the node to.
          * @param node The node that should be added.
@@ -161 +184 @@
          */
         private Node addNode (DataSet data, Node node) {
-                if (Main.pref.mergeNodes)
+                if (Main.pref.mergeNodes || rawGps)
                         for (Node n : data.nodes)
-                                if (node.coor.lat == n.coor.lat && node.coor.lon == n.coor.lon)
+                                if (node.coor.equalsLatLon(n.coor))
                                         return n;
                 data.nodes.add(node);