Changeset 11176 in josm

Timestamp:

2016-10-27T00:32:49+02:00 (8 years ago)

Author:

simon04

Message:

fix #11010 - Wrong order of objects uploaded

Now the uploaded objects are sorted as follows:

• added nodes
• added ways
• added relations
• modified nodes
• modified ways
• modified relations
• deleted relations
• deleted ways
• deleted nodes

File:

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

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
-import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -22 +21 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveComparator;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -78 +76 @@
             }
         }
-        OsmPrimitiveComparator c = new OsmPrimitiveComparator(false, true);
-        toDelete.sort(c);
-        toAdd.sort(c);
-        toUpdate.sort(c);
+        final Comparator<OsmPrimitive> orderingNodesWaysRelations = Comparator.comparingInt(osm -> osm.getType().ordinal());
+        final Comparator<OsmPrimitive> byUniqueId = Comparator.comparing(OsmPrimitive::getUniqueId);
+        toAdd.sort(orderingNodesWaysRelations.thenComparing(byUniqueId));
+        toUpdate.sort(orderingNodesWaysRelations.thenComparing(byUniqueId));
+        toDelete.sort(orderingNodesWaysRelations.reversed().thenComparing(byUniqueId));
     }