Changeset 34922 in osm for applications/editors/josm

Timestamp:

2019-03-20T16:13:04+01:00 (6 years ago)

Author:

gerdp

Message:

fix #17312: problem reverting changeset 67039034
First merge those relations which don't refer to other relations.

File:

• applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java (modified) (3 diffs)

applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java

@@ -97 +97 @@
      *
      */
-    private void mergeWay(Way source) throws IllegalStateException {
+    private void mergeWay(Way source) {
         if (source.isIncomplete()) return;
         if (!source.isVisible()) return;
@@ -143 +143 @@
      * members in source
      */
-    private void mergeRelation(Relation source) throws IllegalStateException {
+    private void mergeRelation(Relation source) {
         if (source.isIncomplete()) return;
         if (!source.isVisible()) return;
@@ -178 +178 @@
             mergeWay(way);
         }
+        // first handle those relations which don't refer to other relations
         for (Relation relation: sourceDataSet.getRelations()) {
-            mergeRelation(relation);
+            if (relation.getMemberPrimitives(Relation.class).isEmpty()) {
+                mergeRelation(relation);
+            }
+        }
+        // now the rest of the relations.
+        for (Relation relation: sourceDataSet.getRelations()) {
+            if (!relation.getMemberPrimitives(Relation.class).isEmpty()) {
+                mergeRelation(relation);
+            }
         }
     }