Changeset 490 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2007-12-14T23:27:55+01:00 (16 years ago)

Author:

gebner

Message:

MergeVisitor.match: Only match objects by content if they're not incomplete.

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (1 diff)

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

@@ -140 +140 @@
 
         private static <P extends OsmPrimitive> boolean match(P p1, P p2) {
-                if (p1.id == 0 || p2.id == 0) {
+                if ((p1.id == 0 || p2.id == 0) && !p1.incomplete && !p2.incomplete) {
                         return realMatch(p1, p2);
                 }