Changeset 263 in josm for src/org/openstreetmap/josm

Timestamp:

2007-06-21T01:56:21+02:00 (17 years ago)

Author:

framm

Message:

• properly merge nodes on import (fixes #166)

File:

• src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (2 diffs)

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

@@ -229 +229 @@
 
         private void fixSegment(Segment ls) {
-            if (mergedNodes.containsKey(ls.from))
+                System.out.println("fix seg" +ls+ " mn="+mergedNodes.size());
+                
+            if (mergedNodes.containsKey(ls.from)) {
                 ls.from = mergedNodes.get(ls.from);
-            if (mergedNodes.containsKey(ls.to))
+                System.out.println("fix from");
+            }
+            if (mergedNodes.containsKey(ls.to))  {
                 ls.to = mergedNodes.get(ls.to);
+                System.out.println("fix to");
+            }
     }
 
@@ -307 +313 @@
                         Date d1 = my.timestamp == null ? new Date(0) : my.timestamp;
                         Date d2 = other.timestamp == null ? new Date(0) : other.timestamp;
-                        if (my.realEqual(other, false))
+                        if (my.realEqual(other, false)) {
+                                if (merged != null)
+                                        merged.put(other, my);
                                 return true; // no merge needed.
+                        }
                         if (my.realEqual(other, true)) {
                                 // they differ in modified/timestamp combination only. Auto-resolve it.