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

Timestamp:

2009-10-25T19:01:00+01:00 (15 years ago)

Author:

Gubaer

Message:

see #3775: JOSM tries to upload a new relation that references a unuploaded way

File:

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

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

@@ -59 +59 @@
             }
             if (osm.isNew() && !osm.isDeleted()) {
-                toAdd.addLast(osm);
+                toAdd.add(osm);
             } else if (osm.isModified() && !osm.isDeleted()) {
-                toUpdate.addLast(osm);
+                toUpdate.add(osm);
             } else if (osm.isDeleted() && !osm.isNew() && osm.isModified()) {
-                toDelete.addFirst(osm);
+                toDelete.add(osm);
             }
         }
         sortDeleted();
+        sortNew();
     }
 
@@ -92 +93 @@
                         else if (o2 instanceof Way && o1 instanceof Relation)
                             return -1;
+
+                        return 0;
+                    }
+                }
+        );
+    }
+
+    /**
+     * Ensures that primitives are added in the following order: Nodes, then Ways,
+     * then Relations.
+     * 
+     */
+    protected void sortNew() {
+        Collections.sort(
+                toAdd,
+                new Comparator<OsmPrimitive>() {
+                    public int compare(OsmPrimitive o1, OsmPrimitive o2) {
+                        if (o1 instanceof Node && o2 instanceof Node)
+                            return 0;
+                        else if (o1 instanceof Node)
+                            return -1;
+                        else if (o2 instanceof Node)
+                            return 1;
+
+                        if (o1 instanceof Way && o2 instanceof Way)
+                            return 0;
+                        else if (o1 instanceof Way && o2 instanceof Relation)
+                            return -1;
+                        else if (o2 instanceof Way && o1 instanceof Relation)
+                            return 1;
 
                         return 0;
@@ -127 +158 @@
             }
         }
+        sortNew();
         sortDeleted();
     }