Changeset 17 in josm for src/org/openstreetmap/josm/data/osm

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

Location:

src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (1 diff)
• Node.java (modified) (1 diff)
• visitor/SelectionComponentVisitor.java (modified) (6 diffs)

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -186 +186 @@
 
         /**
+         * Import the given dataset by merging all data with this dataset.
+         * The objects imported are not cloned, so from now on, these data belong
+         * to both datasets. So use mergeFrom only if you are about to abandon the
+         * other dataset or this dataset.
+         * 
+         * @param ds    The DataSet to merge into this one.
+         * @param mergeEqualNodes If <code>true</code>, nodes with the same lat/lon
+         *              are merged together.
+         */
+        public void mergeFrom(DataSet ds, boolean mergeEqualNodes) {
+                if (mergeEqualNodes) {
+                        LinkedList<Node> nodesToAdd = new LinkedList<Node>();
+                        for (Node n : ds.nodes)
+                                for (Node mynode : nodes) {
+                                        if (mynode.coor.equalsLatLon(n.coor))
+                                                mynode.mergeFrom(n);
+                                        else
+                                                nodesToAdd.add(n);
+                                }
+                } else
+                        nodes.addAll(ds.nodes);
+                tracks.addAll(ds.tracks);
+                pendingLineSegments.addAll(ds.pendingLineSegments);
+        }
+
+        /**
          * Remove the selection from every value in the collection.
          * @param list The collection to remove the selection from.

src/org/openstreetmap/josm/data/osm/Node.java

@@ -33 +33 @@
                 return Collections.unmodifiableCollection(parentSegment);
         }
+
+        /**
+         * Merge the node given at parameter with this node.
+         * All parents of the parameter-node become parents of this node.
+         * 
+         * The argument node is not changed.
+         * 
+         * @param node Merge the node to this.
+         */
+        public void mergeFrom(Node node) {
+                parentSegment.addAll(node.parentSegment);
+                if (keys == null)
+                        keys = node.keys;
+                else if (node.keys != null)
+                        keys.putAll(node.keys);
+        }
         
         /**

src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java

@@ -7 +7 @@
 
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.data.osm.Key;
@@ -13 +12 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Track;
-import org.openstreetmap.josm.gui.Main;
+import org.openstreetmap.josm.gui.ImageProvider;
 
 /**
@@ -38 +37 @@
         public void visit(Key k) {
                 name = k.name;
-                icon = new ImageIcon(Main.class.getResource("/images/data/key.png"));
+                icon = ImageProvider.get("data", "key");
         }
 
@@ -53 +52 @@
                         
                 this.name = name;
-                icon = new ImageIcon("images/data/linesegment.png");
+                icon = ImageProvider.get("data", "linesegment");
         }
 
@@ -67 +66 @@
                 
                 this.name = name;
-                icon = new ImageIcon("images/data/node.png");
+                icon = ImageProvider.get("data", "node");
         }
 
@@ -87 +86 @@
                 
                 this.name = name;
-                icon = new ImageIcon("images/data/track.png");
+                icon = ImageProvider.get("data", "track");
         }