Changeset 3440 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

Timestamp:

2010-08-15T17:31:20+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5333 "Merge selection" tool is broken

File:

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

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

@@ -163 +163 @@
         // Create all primitives first
         for (PrimitiveData primitive: mappedPrimitives.values()) {
-            hull.getPrimitiveById(primitive, true);
-        }
-        // Then fill nodes with data
-        for (PrimitiveData primitive : mappedPrimitives.values()) {
-            if (primitive instanceof NodeData) {
-                if (!primitive.isIncomplete()) {
-                    hull.getPrimitiveById(primitive).load(primitive);
-                }
+            OsmPrimitive newPrimitive = hull.getPrimitiveById(primitive);
+            boolean created = newPrimitive == null;
+            if (created) {
+                newPrimitive = primitive.getType().newInstance(primitive.getUniqueId(), true);
+            }
+            if (newPrimitive instanceof Node && !primitive.isIncomplete()) {
+                newPrimitive.load(primitive);
+            }
+            if (created) {
+                hull.addPrimitive(newPrimitive);
             }
         }
         // Then ways and relations
         for (PrimitiveData primitive : mappedPrimitives.values()) {
-            if (!(primitive instanceof NodeData)) {
-                if (!primitive.isIncomplete()) {
-                    hull.getPrimitiveById(primitive).load(primitive);
-                }
+            if (!(primitive instanceof NodeData) && !primitive.isIncomplete()) {
+                hull.getPrimitiveById(primitive).load(primitive);
             }
         }