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

Timestamp:

2005-10-01T04:01:45+02:00 (19 years ago)

Author:

imi

Message:

• pretty preferrences menu
• drawing double circles on double position hit
• mergeNodes option

File:

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

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.Track;
 import org.openstreetmap.josm.data.osm.LineSegment;
+import org.openstreetmap.josm.gui.Main;
 
 /**
@@ -70 +71 @@
                 data.allNodes = new LinkedList<Node>(); 
                 for (Object o : e.getChildren("wpt", GPX))
-                        data.allNodes.add(parseWaypoint((Element)o));
+                        addNode(data, parseWaypoint((Element)o));
 
                 // read tracks
@@ -79 +80 @@
                                 for (Object w : ((Element)trackSegmentElement).getChildren("trkpt", GPX)) {
                                         Node node = parseWaypoint((Element)w);
-                                        data.allNodes.add(node);
+                                        node = addNode(data, node);
                                         if (start == null)
                                                 start = node;
@@ -96 +97 @@
                 return data;
         }
+        
+        /**
+         * Adds the node to allNodes if it is not already listed. Does respect the
+         * preference setting "mergeNodes". Return the node in the list that correspond
+         * to the node in the list (either the new added or the old found).
+         * 
+         * @param data The DataSet to add the node to.
+         * @param node The node that should be added.
+         * @return Either the parameter node or the old node found in the dataset. 
+         */
+        private Node addNode (DataSet data, Node node) {
+                if (Main.pref.mergeNodes)
+                        for (Node n : data.allNodes)
+                                if (node.equals(n))
+                                        return n;
+                data.allNodes.add(node);
+                return node;
+        }
 }