Changeset 66 in josm

Timestamp:

2006-03-22T19:13:05+01:00 (18 years ago)

Author:

imi

Message:

fixed "segment completly out of map" - problem

Files:

• src/org/openstreetmap/josm/actions/DownloadAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/mapmode/AddLineSegmentAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/command/ChangeKeyValueCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/LineSegment.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/Node.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (5 diffs)
• src/org/openstreetmap/josm/data/osm/Way.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/BoundingVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/CsvVisitor.java (deleted)
• src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/Visitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MapMover.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MapStatus.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/SelectionManager.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/GpxReader.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/GpxWriter.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/OsmReader.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/OsmReaderOld.java (modified) (5 diffs)
• src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (5 diffs)
• src/org/openstreetmap/josm/io/OsmWriter.java (modified) (2 diffs)
• test/org/openstreetmap/josm/test/MergeVisitorTest.java (modified) (2 diffs)
• test/org/openstreetmap/josm/test/framework/DataSetTestCaseHelper.java (modified) (1 diff)

src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -207 +207 @@
                                 }
                                 b.name = JOptionPane.showInputDialog(Main.main, "Please enter a name for the location.");
-                                if (!b.name.equals("")) {
+                                if (b.name != null && !b.name.equals("")) {
                                         ((DefaultListModel)bookmarks.getModel()).addElement(b);
                                         bookmarks.save();
@@ -245 +245 @@
 
         /**
-         * Read the values from the edit fields and start the download.
+         * Read the values from the edit fields and from the download.
          */
         private DownloadStatus startDownload() {

src/org/openstreetmap/josm/actions/mapmode/AddLineSegmentAction.java

@@ -72 +72 @@
 
         /**
-         * If user clicked on a node, start the dragging with that node. 
+         * If user clicked on a node, from the dragging with that node. 
          */
         @Override
@@ -138 +138 @@
                         // try to find a line segment
                         for (LineSegment ls : Main.main.ds.lineSegments)
-                                if ((start == ls.start && end == ls.end) || (end == ls.start && start == ls.end))
+                                if ((start == ls.from && end == ls.to) || (end == ls.from && start == ls.to))
                                         return; // already a line segment here - be happy, do nothing.
 

src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java

@@ -50 +50 @@
         public void mouseClicked(MouseEvent e) {
                 if (e.getButton() == MouseEvent.BUTTON1) {
-                        Node node = new Node();
-                        node.coor = mv.getPoint(e.getX(), e.getY(), true);
+                        Node node = new Node(mv.getPoint(e.getX(), e.getY(), true));
                         if (node.coor.isOutSideWorld()) {
                                 JOptionPane.showMessageDialog(Main.main, "Can not add a node outside of the world.");

src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java

@@ -88 +88 @@
                 // 0  if no elements in list, quit
                 // 1  taking the first ls as pivot, remove it from list
-                // 2  searching for a connection at start or end of pivot
+                // 2  searching for a connection at from or to of pivot
                 // 3  if found, attach it, remove it from list, goto 2
                 // 4  if not found, save the pivot-string and goto 0
@@ -100 +100 @@
                                 for (Iterator<LineSegment> it = lineSegments.iterator(); it.hasNext();) {
                                         LineSegment ls = it.next();
-                                        if (ls.start == pivotList.getLast().end) {
+                                        if (ls.incomplete)
+                                                continue; // incomplete segments are never added to a new way
+                                        if (ls.from == pivotList.getLast().to) {
                                                 pivotList.addLast(ls);
                                                 it.remove();
                                                 found = true;
-                                        } else if (ls.end == pivotList.getFirst().start) {
+                                        } else if (ls.to == pivotList.getFirst().from) {
                                                 pivotList.addFirst(ls);
                                                 it.remove();
@@ -115 +117 @@
                 
                 Way t = new Way();
-                for (LineSegment ls : sortedLineSegments)
-                        t.segments.add(ls);
+                t.segments.addAll(sortedLineSegments);
                 mv.editLayer().add(new AddCommand(Main.main.ds, t));
                 Main.main.ds.clearSelection();

src/org/openstreetmap/josm/command/ChangeKeyValueCommand.java

@@ -59 +59 @@
 
                 if (value == null) {
-                        for (OsmPrimitive osm : objects) {
-                                if (osm.keys != null) {
-                                        osm.keys.remove(key);
-                                        if (osm.keys.isEmpty())
-                                                osm.keys = null;
-                                }
-                        }
+                        for (OsmPrimitive osm : objects)
+                                osm.remove(key);
                 } else {
-                        for (OsmPrimitive osm : objects) {
-                                if (osm.keys == null)
-                                        osm.keys = new HashMap<String, String>();
-                                osm.keys.put(key, value);
-                        }
+                        for (OsmPrimitive osm : objects)
+                                osm.put(key, value);
                 }
         }

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

@@ -6 +6 @@
 
 /**
- * One way line segment consisting of a pair of nodes (start/end) 
+ * One way line segment consisting of a pair of nodes (from/to) 
  *
  * @author imi
@@ -15 +15 @@
          * The starting node of the line segment
          */
-        public Node start;
+        public Node from;
         
         /**
          * The ending node of the line segment
          */
-        public Node end;
+        public Node to;
+
+        /**
+         * If set to true, this object is incomplete, which means only the id
+         * and type is known (type is the objects instance class)
+         */
+        public boolean incomplete;
 
         /**
          * Create an line segment from the given starting and ending node
-         * @param start Starting node of the line segment.
-         * @param end   Ending node of the line segment.
+         * @param from  Starting node of the line segment.
+         * @param to    Ending node of the line segment.
          */
-        public LineSegment(Node start, Node end) {
-                this.start = start;
-                this.end = end;
+        public LineSegment(Node from, Node to) {
+                this.from = from;
+                this.to = to;
+                incomplete = false;
+        }
+
+        public LineSegment(long id) {
+                this.id = id;
+                incomplete = true;
         }
 
@@ -44 +56 @@
                 if (equals(ls))
                         return true;
-                GeoPoint s1 = start.coor;
-                GeoPoint s2 = ls.start.coor;
-                GeoPoint e1 = end.coor;
-                GeoPoint e2 = ls.end.coor;
+                if (incomplete || ls.incomplete)
+                        return false;
+                GeoPoint s1 = from.coor;
+                GeoPoint s2 = ls.from.coor;
+                GeoPoint e1 = to.coor;
+                GeoPoint e2 = ls.to.coor;
                 return ((s1.equalsLatLon(s2) && e1.equalsLatLon(e2)) ||
                                 (s1.equalsLatLon(e2) && e1.equalsLatLon(s2)));
         }
+
+        @Override
+        public String toString() {
+                String s = "{LineSegment id="+id;
+                if (incomplete)
+                        return s+",incomplete}";
+                return s+",from="+from+",to="+to+"}";
+        }
+
+        @Override
+        public void cloneFrom(OsmPrimitive osm) {
+                super.cloneFrom(osm);
+                LineSegment ls = ((LineSegment)osm);
+                from = ls.from;
+                to = ls.to;
+                incomplete = ls.incomplete;
+        }
 }       

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

@@ -17 +17 @@
         public GeoPoint coor;
 
+        public Node(GeoPoint coor) {
+                this.coor = coor;
+        }
+
         @Override
         public void visit(Visitor visitor) {
                 visitor.visit(this);
         }
+        
+        @Override
+        public String toString() {
+                return "{Node id="+id+",lat="+coor.lat+",lon="+coor.lon+"}";
+        }
+
+        @Override
+        public void cloneFrom(OsmPrimitive osm) {
+                super.cloneFrom(osm);
+                GeoPoint g = ((Node)osm).coor;
+                coor = new GeoPoint(g.lat, g.lon, g.x, g.y); //TODO: Make GeoPoint immutable!
+        }
 }

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

@@ -1 +1 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.openstreetmap.josm.Main;
@@ -64 +67 @@
          */
         abstract public void visit(Visitor visitor);
-        
+
         /**
          * Return <code>true</code>, if either <code>this.keys</code> and 
@@ -119 +122 @@
          * Equal, if the id (and class) is equal. If both ids are 0, use the super classes
          * equal instead.
+         * 
+         * An primitive is equal to its incomplete counter part.
          */
         @Override
@@ -129 +134 @@
         /**
          * Return the id as hashcode or supers hashcode if 0.
+         * 
+         * An primitive has the same hashcode as its incomplete counter part.
          */
         @Override
@@ -145 +152 @@
                 keys.put(key, value);
         }
+        /**
+         * Remove the given key from the list.
+         */
+        public void remove(String key) {
+                if (keys != null) {
+                        keys.remove(key);
+                        if (keys.isEmpty())
+                                keys = null;
+                }
+        }
+
+        public String get(String key) {
+                return keys == null ? null : keys.get(key);
+        }
         
-        public String get(String key) {
-                return (keys == null) ? null : keys.get(key);
+        public Collection<Entry<String, String>> entrySet() {
+                if (keys == null)
+                        return Collections.emptyList();
+                return keys.entrySet();
+        }
+
+        public Collection<String> keySet() {
+                if (keys == null)
+                        return Collections.emptyList();
+                return keys.keySet();
+        }
+
+        /**
+         * Get and write all attributes from the parameter. Does not fire any listener, so
+         * use this only in the data initializing phase
+         */
+        public void cloneFrom(OsmPrimitive osm) {
+                keys = osm.keys;
+                id = osm.id;
+                modified = osm.modified;
+                modifiedProperties = osm.modifiedProperties;
+                deleted = osm.deleted;
+                selected = osm.selected;
         }
 }

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

@@ -18 +18 @@
         public final List<LineSegment> segments = new ArrayList<LineSegment>();
 
-        
-        /**
-         * Return the last node in the way. This is the node, which no line segment
-         * has as start, but at least one has it as end. If there are not exact one
-         * such nodes found, <code>null</code> is returned.
-         *
-         * TODO Currently does return just the end node in the list.
-         *
-         * @return The ending node, if there is one.
-         */
-        public Node getEndingNode() {
-                if (segments.isEmpty())
-                        return null;
-                return segments.get(segments.size()-1).end;
-        }
-        
-        /**
-         * Return the last segment.
-         * @see #getEndingNode()
-         */
-        public LineSegment getEndingSegment() {
-                if (segments.isEmpty())
-                        return null;
-                return segments.get(segments.size()-1);
-        }
-
-        /**
-         * Return the first node in the way. This is the node, which no line segment
-         * has as end, but at least one as starting node. If there are not exact one
-         * such nodes found, <code>null</code> is returned.
-         * 
-         * TODO Currently does return just the first node in the list.
-         * 
-         * @return The starting node, if there is one.
-         */
-        public Node getStartingNode() {
-                if (segments.isEmpty())
-                        return null;
-                return segments.get(0).start;
-        }
-        
-        /**
-         * Return the first segment.
-         * @see #getStartingNode()
-         */
-        public LineSegment getStartingSegment() {
-                if (segments.isEmpty())
-                        return null;
-                return segments.get(0);
-        }
-
         @Override
         public void visit(Visitor visitor) {
                 visitor.visit(this);
         }
+
+        @Override
+        public void cloneFrom(OsmPrimitive osm) {
+                super.cloneFrom(osm);
+                segments.clear();
+                segments.addAll(((Way)osm).segments);
+        }
 }

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

@@ -29 +29 @@
 
         /**
-         * Line segments have exactly two nodes: start and end.
+         * Line segments have exactly two nodes: from and to.
          */
         public void visit(LineSegment ls) {
-                nodes.add(ls.start);
-                nodes.add(ls.end);
+                if (!ls.incomplete) {
+                        visit(ls.from);
+                        visit(ls.to);
+                }
         }
 
@@ -40 +42 @@
          */
         public void visit(Way t) {
-                for (LineSegment ls : t.segments) {
-                        nodes.add(ls.start);
-                        nodes.add(ls.end);
-                }
+                for (LineSegment ls : t.segments)
+                        visit(ls);
         }
 

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

@@ -48 +48 @@
 
         public void visit(LineSegment ls) {
-                visit(ls.start);
-                visit(ls.end);
+                if (!ls.incomplete) {
+                        visit(ls.from);
+                        visit(ls.to);
+                }
         }
 

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

@@ -41 +41 @@
                                 continue;
                         for (LineSegment ls : t.segments) {
-                                if (ls.start == n || ls.end == n) {
+                                if (ls.incomplete)
+                                        continue;
+                                if (ls.from == n || ls.to == n) {
                                         data.add(t);
                                         break;
@@ -48 +50 @@
                 }
                 for (LineSegment ls : ds.lineSegments) {
-                        if (ls.isDeleted())
+                        if (ls.isDeleted() || ls.incomplete)
                                 continue;
-                        if (ls.start == n || ls.end == n)
+                        if (ls.from == n || ls.to == n)
                                 data.add(ls);
                 }

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

@@ -79 +79 @@
                 if (myLs == null)
                         ds.lineSegments.add(otherLs);
-                else {
+                else if (myLs.incomplete && !otherLs.incomplete) {
+                        mergedLineSegments.put(otherLs, myLs);
+                        myLs.cloneFrom(otherLs);
+                } else if (!otherLs.incomplete) {
                         mergedLineSegments.put(otherLs, myLs);
                         mergeCommon(myLs, otherLs);
                         if (myLs.modified && !otherLs.modified)
                                 return;
-                        if (!match(myLs.start, otherLs.start)) {
-                                myLs.start = otherLs.start;
+                        if (!match(myLs.from, otherLs.from)) {
+                                myLs.from = otherLs.from;
                                 myLs.modified = otherLs.modified;
                         }
-                        if (!match(myLs.end, otherLs.end)) {
-                                myLs.end = otherLs.end;
+                        if (!match(myLs.to, otherLs.to)) {
+                                myLs.to = otherLs.to;
                                 myLs.modified = otherLs.modified;
                         }
@@ -133 +136 @@
         public void fixReferences() {
                 for (LineSegment ls : ds.lineSegments) {
-                        if (mergedNodes.containsKey(ls.start))
-                                ls.start = mergedNodes.get(ls.start);
-                        if (mergedNodes.containsKey(ls.end))
-                                ls.end = mergedNodes.get(ls.end);
+                        if (mergedNodes.containsKey(ls.from))
+                                ls.from = mergedNodes.get(ls.from);
+                        if (mergedNodes.containsKey(ls.to))
+                                ls.to = mergedNodes.get(ls.to);
                 }
                 for (Way t : ds.waies) {
@@ -152 +155 @@
                         }
                         for (LineSegment ls : t.segments) {
-                                if (mergedNodes.containsKey(ls.start))
-                                        ls.start = mergedNodes.get(ls.start);
-                                if (mergedNodes.containsKey(ls.end))
-                                        ls.end = mergedNodes.get(ls.end);
+                                if (mergedNodes.containsKey(ls.from))
+                                        ls.from = mergedNodes.get(ls.from);
+                                if (mergedNodes.containsKey(ls.to))
+                                        ls.to = mergedNodes.get(ls.to);
                         }
                 }
@@ -173 +176 @@
          */
         private boolean match(LineSegment ls1, LineSegment ls2) {
-                if (ls1.id == 0 || ls2.id == 0)
-                        return match(ls1.start, ls2.start) && match(ls1.end, ls2.end);
-                return ls1.id == ls2.id;
+                if (ls1.id == ls2.id)
+                        return true;
+                if (ls1.incomplete || ls2.incomplete)
+                        return false;
+                return match(ls1.from, ls2.from) && match(ls1.to, ls2.to);
         }
 

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

@@ -3 +3 @@
 
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
@@ -36 +35 @@
          */
         public void visit(LineSegment ls) {
-                String name = getName(ls.keys);
+                name = ls.get("name");
+                if (name == null && ls.incomplete)
+                        name = ""+ls.id;
                 if (name == null)
-                        name = "("+ls.start.coor.lat+","+ls.start.coor.lon+") -> ("+ls.end.coor.lat+","+ls.end.coor.lon+")";
-                        
-                this.name = name;
+                        name = "("+ls.from.coor.lat+","+ls.from.coor.lon+") -> ("+ls.to.coor.lat+","+ls.to.coor.lon+")";
                 icon = ImageProvider.get("data", "linesegment");
         }
@@ -49 +48 @@
          */
         public void visit(Node n) {
-                String name = getName(n.keys);
+                name = n.get("name");
                 if (name == null)
                         name = "("+n.coor.lat+","+n.coor.lon+")";
-                
-                this.name = name;
                 icon = ImageProvider.get("data", "node");
         }
@@ -61 +58 @@
          * is displayed with x beeing the number of nodes in the way.
          */
-        public void visit(Way t) {
-                String name = getName(t.keys);
+        public void visit(Way w) {
+                name = w.get("name");
                 if (name == null) {
                         Set<Node> nodes = new HashSet<Node>();
-                        for (LineSegment ls : t.segments) {
-                                nodes.add(ls.start);
-                                nodes.add(ls.end);
+                        for (LineSegment ls : w.segments) {
+                                if (!ls.incomplete) {
+                                        nodes.add(ls.from);
+                                        nodes.add(ls.to);
+                                }
                         }
                         name = "("+nodes.size()+" nodes)";
                 }
-                
-                this.name = name;
                 icon = ImageProvider.get("data", "way");
         }
-
-        
-        /**
-         * Try to read a name from the given properties.
-         * @param keys The properties to search for a name. Can be <code>null</code>.
-         * @return If a name could be found, return it here.
-         */
-        public String getName(Map<String, String> keys) {
-                String name = null;
-                if (keys != null) {
-                        name = keys.get("name");
-                        if (name == null)
-                                name = keys.get("id");
-                }
-                return name;
-        }
-        
 }

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

@@ -18 +18 @@
 public class SimplePaintVisitor implements Visitor {
 
+        private final static Color darkerblue = new Color(0,0,96);
         private final static Color darkblue = new Color(0,0,128);
         private final static Color darkgreen = new Color(0,128,0);
@@ -64 +65 @@
         public void visit(Way t) {
                 // only to overwrite with blue
+                Color wayColor = darkblue;
+                for (LineSegment ls : t.segments) {
+                        if (ls.incomplete) {
+                                wayColor = darkerblue;
+                                break;
+                        }
+                }
                 for (LineSegment ls : t.segments)
                         if (!ls.isSelected()) // selected already in good color
-                                drawLineSegment(ls, t.isSelected() ? Color.WHITE : darkblue);
+                                drawLineSegment(ls, t.isSelected() ? Color.WHITE : wayColor);
         }
 
@@ -85 +93 @@
          */
         private void drawLineSegment(LineSegment ls, Color col) {
+                if (ls.incomplete)
+                        return;
                 if (ls.isSelected())
                         col = Color.WHITE;
                 g.setColor(col);
-                Point p1 = nc.getScreenPoint(ls.start.coor);
-                Point p2 = nc.getScreenPoint(ls.end.coor);
+                Point p1 = nc.getScreenPoint(ls.from.coor);
+                Point p2 = nc.getScreenPoint(ls.to.coor);
                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
         }

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

@@ -14 +14 @@
         void visit(Node n);
         void visit(LineSegment ls);
-        void visit(Way t);
+        void visit(Way w);
 }

src/org/openstreetmap/josm/gui/MapMover.java

@@ -83 +83 @@
          * Start movement by setting a new cursor and remember the current mouse
          * position.
-         * @param e The mouse event that leat to the movement start.
+         * @param e The mouse event that leat to the movement from.
          */
         private void startMovement(MouseEvent e) {

src/org/openstreetmap/josm/gui/MapStatus.java

@@ -139 +139 @@
                                                         if (osm.id != 0)
                                                                 text.append("<br>id="+osm.id);
-                                                        if (osm.keys != null)
-                                                                for (Entry<String, String> e : osm.keys.entrySet())
-                                                                        text.append("<br>"+e.getKey()+"="+e.getValue());
+                                                        for (Entry<String, String> e : osm.entrySet())
+                                                                text.append("<br>"+e.getKey()+"="+e.getValue());
                                                         final JLabel l = new JLabel("<html>"+text.toString()+"</html>", visitor.icon, JLabel.HORIZONTAL);
                                                         l.setFont(l.getFont().deriveFont(Font.PLAIN));

src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -156 +156 @@
                                         continue;
                                 for (LineSegment ls : w.segments) {
-                                        if (ls.isDeleted())
+                                        if (ls.isDeleted() || ls.incomplete)
                                                 continue;
-                                        Point A = getScreenPoint(ls.start.coor);
-                                        Point B = getScreenPoint(ls.end.coor);
+                                        Point A = getScreenPoint(ls.from.coor);
+                                        Point B = getScreenPoint(ls.to.coor);
                                         double c = A.distanceSq(B);
                                         double a = p.distanceSq(B);
@@ -177 +177 @@
                 // line segments
                 for (LineSegment ls : Main.main.ds.lineSegments) {
-                        if (ls.isDeleted())
+                        if (ls.isDeleted() || ls.incomplete)
                                 continue;
-                        Point A = getScreenPoint(ls.start.coor);
-                        Point B = getScreenPoint(ls.end.coor);
+                        Point A = getScreenPoint(ls.from.coor);
+                        Point B = getScreenPoint(ls.to.coor);
                         double c = A.distanceSq(B);
                         double a = p.distanceSq(B);
@@ -225 +225 @@
                         for (LineSegment ls : Main.main.ds.lineSegments)
                                 // line segments never match nodes, so they are skipped by contains
-                                if (!ls.isDeleted() && (c.contains(ls.start) || c.contains(ls.end)))
+                                if (!ls.isDeleted() && !ls.incomplete && (c.contains(ls.from) || c.contains(ls.to)))
                                         c.add(ls);
                 } 
@@ -239 +239 @@
                                         continue;
                                 for (LineSegment ls : t.segments) {
-                                        if (!ls.isDeleted() && c.contains(ls)) {
+                                        if (!ls.isDeleted() && !ls.incomplete && c.contains(ls)) {
                                                 c.add(t);
                                                 break;

src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -135 +135 @@
 
         /**
-         * If the correct button, start the "drawing rectangle" mode
+         * If the correct button, from the "drawing rectangle" mode
          */
         public void mousePressed(MouseEvent e) {
@@ -309 +309 @@
          */
         private boolean rectangleContainLineSegment(Rectangle r, boolean alt, LineSegment ls) {
+                if (ls.incomplete)
+                        return false;
                 if (alt) {
-                        Point p1 = nc.getScreenPoint(ls.start.coor);
-                        Point p2 = nc.getScreenPoint(ls.end.coor);
+                        Point p1 = nc.getScreenPoint(ls.from.coor);
+                        Point p2 = nc.getScreenPoint(ls.to.coor);
                         if (r.intersectsLine(p1.x, p1.y, p2.x, p2.y))
                                 return true;
                 } else {
-                        if (r.contains(nc.getScreenPoint(ls.start.coor))
-                                        && r.contains(nc.getScreenPoint(ls.end.coor)))
+                        if (r.contains(nc.getScreenPoint(ls.from.coor))
+                                        && r.contains(nc.getScreenPoint(ls.to.coor)))
                                 return true;
                 }

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -14 +14 @@
 import java.awt.event.WindowFocusListener;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -61 +63 @@
 
         /**
-         * Watches for double clicks and start editing or new property, depending on the
+         * Watches for double clicks and from editing or new property, depending on the
          * location, the click was.
          * @author imi
@@ -78 +80 @@
                 }
         }
-        
+
         /**
          * Edit the value in the table row
@@ -143 +145 @@
                 Vector<String> allKeys = new Vector<String>();
                 for (OsmPrimitive osm : Main.main.ds.allNonDeletedPrimitives())
-                        if (osm.keys != null)
-                                allKeys.addAll(osm.keys.keySet());
+                        allKeys.addAll(osm.keySet());
                 for (Iterator<String> it = allKeys.iterator(); it.hasNext();) {
                         String s = it.next();
@@ -293 +294 @@
                         propertyTable.getCellEditor().cancelCellEditing();
                 data.setRowCount(0);
+                
+                Map<String, Integer> valueCount = new HashMap<String, Integer>();
                 TreeMap<String, Collection<String>> props = new TreeMap<String, Collection<String>>();
                 for (OsmPrimitive osm : newSelection) {
-                        if (osm.keys != null) {
-                                for (Entry<String, String> e : osm.keys.entrySet()) {
-                                        Collection<String> value = props.get(e.getKey());
-                                        if (value == null) {
-                                                value = new TreeSet<String>();
-                                                props.put(e.getKey(), value);
-                                        }
-                                        value.add(e.getValue());
+                        for (Entry<String, String> e : osm.entrySet()) {
+                                Collection<String> value = props.get(e.getKey());
+                                if (value == null) {
+                                        value = new TreeSet<String>();
+                                        props.put(e.getKey(), value);
                                 }
+                                value.add(e.getValue());
+                                valueCount.put(e.getKey(), valueCount.containsKey(e.getKey()) ? valueCount.get(e.getKey())+1 : 1);
                         }
                 }
@@ -309 +311 @@
                         JComboBox value = new JComboBox(e.getValue().toArray());
                         value.setEditable(true);
-                        value.getEditor().setItem(e.getValue().size() > 1 ? "<different>" : e.getValue().iterator().next());
+                        value.getEditor().setItem(valueCount.get(e.getKey()) != newSelection.size() ? "<different>" : e.getValue().iterator().next());
                         data.addRow(new Object[]{e.getKey(), value});
                 }

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -93 +93 @@
                                 Main.main.ds.clearSelection();
                                 for (OsmPrimitive osm : Main.main.ds.allNonDeletedPrimitives()) {
-                                        if (osm.keys != null) {
-                                                for (Entry<String, String> ent : osm.keys.entrySet()) {
-                                                        if (match(lastSearch, ent.getKey(), ent.getValue())) {
-                                                                osm.setSelected(true);
-                                                                break;
-                                                        }
+                                        for (Entry<String, String> ent : osm.entrySet()) {
+                                                if (match(lastSearch, ent.getKey(), ent.getValue())) {
+                                                        osm.setSelected(true);
+                                                        break;
                                                 }
                                         }

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

@@ -73 +73 @@
          */
         private Node parseWaypoint(Element e) {
-                Node data = new Node();
-                data.coor = new GeoPoint(
+                Node data = new Node(new GeoPoint(
                         Double.parseDouble(e.getAttributeValue("lat")),
-                        Double.parseDouble(e.getAttributeValue("lon")));
+                        Double.parseDouble(e.getAttributeValue("lon"))));
                 
                 for (Object o : e.getChildren()) {
@@ -200 +199 @@
                 if (e != null) {
                         for (Object o : e.getChildren("property", OSM)) {
-                                if (osm.keys == null)
-                                        osm.keys = new HashMap<String, String>();
                                 Element child = (Element)o;
                                 String keyname = child.getAttributeValue("key");
@@ -208 +205 @@
                                         if (value == null)
                                                 value = "";
-                                        osm.keys.put(keyname, value);
+                                        osm.put(keyname, value);
                                 }
                         }
@@ -251 +248 @@
         private void parseKeyValueLink(OsmPrimitive osm, Element e) {
                 if (e != null) {
-                        if (osm.keys == null)
-                                osm.keys = new HashMap<String, String>();
                         String link = e.getChildText("type") + ";" + e.getChildText("text");
-                        osm.keys.put("link", link);
+                        osm.put("link", link);
                 }
         }

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

@@ -127 +127 @@
                         for (LineSegment ls : t.segments) {
                                 tElem.getChildren().add(parseLineSegment(ls));
-                                unrefNodes.remove(ls.start);
-                                unrefNodes.remove(ls.end);
+                                unrefNodes.remove(ls.from);
+                                unrefNodes.remove(ls.to);
                                 unrefLs.remove(ls);
                         }
@@ -141 +141 @@
                         Element t = new Element("trk", GPX);
                         t.getChildren().add(parseLineSegment(ls));
-                        unrefNodes.remove(ls.start);
-                        unrefNodes.remove(ls.end);
+                        unrefNodes.remove(ls.from);
+                        unrefNodes.remove(ls.to);
                         Element ext = new Element("extensions", GPX);
                         ext.getChildren().add(new Element("segment", JOSM));
@@ -180 +180 @@
                 Element lsElem = new Element("trkseg", GPX);
                 addPropertyExtensions(lsElem, ls.keys, ls);
-                lsElem.getChildren().add(parseWaypoint(ls.start, "trkpt"));
-                lsElem.getChildren().add(parseWaypoint(ls.end, "trkpt"));
+                lsElem.getChildren().add(parseWaypoint(ls.from, "trkpt"));
+                lsElem.getChildren().add(parseWaypoint(ls.to, "trkpt"));
                 return lsElem;
         }

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

@@ -15 +15 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
 
 import uk.co.wilson.xml.MinML2;
@@ -77 +76 @@
                                         throw new SAXException("Unknown version: "+atts.getValue("version"));
                         } else if (qName.equals("node")) {
-                                Node n = new Node();
-                                n.coor = new GeoPoint(getDouble(atts, "lat"), getDouble(atts, "lon"));
+                                Node n = new Node(new GeoPoint(getDouble(atts, "lat"), getDouble(atts, "lon")));
                                 current = n;
                                 readCommon(atts);
@@ -94 +92 @@
                         } else if (qName.equals("seg")) {
                                 if (current instanceof Way) {
-                                        LineSegment ls = lineSegments.get(getLong(atts, "id"));
-                                        if (ls == null)
-                                                fatalError(new SAXParseException("Line segment "+getLong(atts, "id")+" has not been transfered before.", null));
+                                        long id = getLong(atts, "id");
+                                        LineSegment ls = lineSegments.get(id);
+                                        if (ls == null) {
+                                                ls = new LineSegment(id); // incomplete line segment
+                                                lineSegments.put(id, ls);
+                                                adder.visit(ls);
+                                        }
                                         ((Way)current).segments.add(ls);
                                 }

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

@@ -4 +4 @@
 import java.io.Reader;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.StringTokenizer;
 
@@ -63 +62 @@
          */
         private Node parseNode(Element e) throws JDOMException {
-                Node data = new Node();
-                data.coor = new GeoPoint(
+                Node data = new Node(new GeoPoint(
                         Double.parseDouble(e.getAttributeValue("lat")),
-                        Double.parseDouble(e.getAttributeValue("lon")));
+                        Double.parseDouble(e.getAttributeValue("lon"))));
                 if (Double.isNaN(data.coor.lat) || 
                                 data.coor.lat < -90 || data.coor.lat > 90 ||
@@ -175 +173 @@
                 String propStr = e.getAttributeValue("tags");
                 if (propStr != null && !propStr.equals("")) {
-                        data.keys = new HashMap<String, String>();
                         StringTokenizer st = new StringTokenizer(propStr, ";");
                         while (st.hasMoreTokens()) {
@@ -183 +180 @@
                                 int equalPos = next.indexOf('=');
                                 if (equalPos == -1)
-                                        data.keys.put(next, "");
+                                        data.put(next, "");
                                 else {
                                         String keyStr = next.substring(0, equalPos);
-                                        data.keys.put(keyStr, next.substring(equalPos+1));
+                                        data.put(keyStr, next.substring(equalPos+1));
                                 }
                         }
@@ -210 +207 @@
                 String key = e.getAttributeValue("key");
                 String value = e.getAttributeValue("value");
-                if (value != null) {
-                        if (osm.keys == null)
-                                osm.keys = new HashMap<String, String>();
-                        osm.keys.put(key, value);
-                }
+                if (value != null)
+                        osm.put(key, value);
         }
 

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

@@ -12 +12 @@
 import java.net.UnknownHostException;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.LinkedList;
 
@@ -67 +66 @@
         public void visit(Node n) {
                 if (n.id == 0 && !n.isDeleted()) {
-                        setCredits(n);
+                        n.put("created_by", "JOSM");
                         sendRequest("PUT", "node", n, true);
                 } else if (n.isDeleted()) {
@@ -82 +81 @@
         public void visit(LineSegment ls) {
                 if (ls.id == 0 && !ls.isDeleted()) {
-                        setCredits(ls);
+                        ls.put("created_by", "JOSM");
                         sendRequest("PUT", "segment", ls, true);
                 } else if (ls.isDeleted()) {
@@ -97 +96 @@
         public void visit(Way w) {
                 if (w.id == 0 && !w.isDeleted()) {
-                        setCredits(w);
+                        w.put("created_by", "JOSM");
                         sendRequest("PUT", "way", w, true);
                 } else if (w.isDeleted()) {
@@ -106 +105 @@
                 processed.add(w);
         }
-
-        /**
-         * Add the created_by - property to indicate that JOSM was the
-         * creating application.
-         * @param osm The primitive to add the credits to
-         */
-        private void setCredits(OsmPrimitive osm) {
-                if (osm.keys == null)
-                        osm.keys = new HashMap<String, String>();
-                osm.keys.put("created_by", "JOSM");
-        }
-
 
         /**

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

@@ -104 +104 @@
 
         public void visit(LineSegment ls) {
+                if (ls.incomplete)
+                        throw new IllegalArgumentException("Cannot write an incomplete LineSegment.");
                 addCommon(ls, "segment");
-                out.print(" from='"+getUsedId(ls.start)+"' to='"+getUsedId(ls.end)+"'");
+                out.print(" from='"+getUsedId(ls.from)+"' to='"+getUsedId(ls.to)+"'");
                 addTags(ls, "segment", true);
         }
@@ -164 +166 @@
 
         /**
-         * Add the common part as the start of the tag as well as the id or the action tag.
+         * Add the common part as the from of the tag as well as the id or the action tag.
          */
         private void addCommon(OsmPrimitive osm, String tagname) {

test/org/openstreetmap/josm/test/MergeVisitorTest.java

@@ -25 +25 @@
                 ls1.id = 3;
 
-                Node newnode = new Node();
-                newnode.coor = new GeoPoint(n[1].coor.lat, n[1].coor.lon);
+                Node newnode = new Node(new GeoPoint(n[1].coor.lat, n[1].coor.lon));
                 LineSegment newls = new LineSegment(n[0], newnode);
 
@@ -57 +56 @@
                 v.fixReferences();
                 
-                assertSame(ls1.start, ls2.start);
+                assertSame(ls1.from, ls2.from);
         }
         

test/org/openstreetmap/josm/test/framework/DataSetTestCaseHelper.java

@@ -59 +59 @@
          */
         public static Node createNode(DataSet ds) {
-                Node node = new Node();
-                node.coor = new GeoPoint(Math.random(), Math.random());
+                Node node = new Node(new GeoPoint(Math.random(), Math.random()));
                 ds.nodes.add(node);
                 return node;