Changeset 2971 in josm for trunk/src/org

Timestamp:

2010-02-12T23:23:11+01:00 (15 years ago)

Author:

jttt

Message:

Create all relations first in OsmReader to prevent (bogus) consistency errors

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -469 +469 @@
      */
     private void processRelationsAfterParsing() throws IllegalDataException {
+
+        // First add all relations to make sure that when relation reference other relation, the referenced will be already in dataset
+        for (Long externalRelationId : relations.keySet()) {
+            Relation relation = (Relation) externalIdMap.get(
+                    new SimplePrimitiveId(externalRelationId, OsmPrimitiveType.RELATION)
+            );
+            ds.addPrimitive(relation);
+        }
+
         for (Long externalRelationId : relations.keySet()) {
             Relation relation = (Relation) externalIdMap.get(
@@ -517 +526 @@
             }
             relation.setMembers(relationMembers);
-            ds.addPrimitive(relation);
         }
     }