Changeset 13018 in josm for trunk

Timestamp:

2017-10-18T11:37:34+02:00 (7 years ago)

Author:

bastiK

Message:

fixed #15374 - problem deleting multilevel relations

File:

• trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -213 +213 @@
 
         RelationUploadDependencyGraph graph = new RelationUploadDependencyGraph(relationsToAdd, true);
-        newToAdd.addAll(graph.computeUploadOrder());
+        newToAdd.addAll(graph.computeUploadOrder(false));
         toAdd = newToAdd;
 
         List<OsmPrimitive> newToDelete = new LinkedList<>();
         graph = new RelationUploadDependencyGraph(Utils.filteredCollection(toDelete, Relation.class), false);
-        newToDelete.addAll(graph.computeUploadOrder());
+        newToDelete.addAll(graph.computeUploadOrder(true));
         newToDelete.addAll(Utils.filteredCollection(toDelete, Way.class));
         newToDelete.addAll(Utils.filteredCollection(toDelete, Node.class));
@@ -305 +305 @@
         }
 
-        public List<Relation> computeUploadOrder() throws CyclicUploadDependencyException {
+        public List<Relation> computeUploadOrder(boolean reverse) throws CyclicUploadDependencyException {
             visited = new HashSet<>();
             uploadOrder = new LinkedList<>();
@@ -313 +313 @@
             }
             List<Relation> ret = new ArrayList<>(relations);
-            ret.sort(Comparator.comparingInt(uploadOrder::indexOf));
+            Comparator<? super Relation> cmpr = Comparator.comparingInt(uploadOrder::indexOf);
+            if (reverse) {
+                cmpr = cmpr.reversed();
+            }
+            ret.sort(cmpr);
             return ret;
         }