Changeset 3265 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-05-19T21:12:59+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5049 org.openstreetmap.josm.data.osm.DataIntegrityProblemException: Complete node with null coordinates: ... Coor is null

File:

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

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

@@ -8 +8 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
@@ -164 +165 @@
             hull.getPrimitiveById(primitive, true);
         }
-        // Then fill them with data
+        // Then fill nodes with data
         for (PrimitiveData primitive : mappedPrimitives.values()) {
-            if (!primitive.isIncomplete()) {
-                hull.getPrimitiveById(primitive).load(primitive);
+            if (primitive instanceof NodeData) {
+                if (!primitive.isIncomplete()) {
+                    hull.getPrimitiveById(primitive).load(primitive);
+                }
+            }
+        }
+        // Then ways and relations
+        for (PrimitiveData primitive : mappedPrimitives.values()) {
+            if (!(primitive instanceof NodeData)) {
+                if (!primitive.isIncomplete()) {
+                    hull.getPrimitiveById(primitive).load(primitive);
+                }
             }
         }