Changeset 2612 in josm for trunk/src/org/openstreetmap/josm/data/osm/Node.java

Timestamp:

2009-12-11T22:52:54+01:00 (14 years ago)

Author:

mjulius

Message:

Fixes #4083 - exception when copying relation with incomplete node
Fixes #4141 - relax conflict detection for coordinates; API only returns 7 decimals

File:

• trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) (2 diffs)

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

@@ -136 +136 @@
         NodeData data = new NodeData();
         saveCommonAttributes(data);
-        data.setCoor(getCoor());
+        if (!isIncomplete()) {
+            data.setCoor(getCoor());
+        }
         return data;
     }
@@ -155 +157 @@
             return true;
         else if (coor != null && n.coor != null)
-            return coor.equals(n.coor);
+            return coor.equalsEpsilon(n.coor);
         else
             return false;