Ticket #19532: 19532-fix.patch

src/org/openstreetmap/josm/data/osm/UniqueIdGenerator.java

@@ -39 +39 @@
         }
         idCounter.set(newId);
     }
+
+
+    /**
+     * Generates a new primitive unique id. Uses the given value if that is smaller than the current id.
+     * @param wanted the wanted id
+     * @return long that is either equal
+     * @since xxx
+     */
+    public long advanceOrGenerate(long wanted) {
+        return idCounter.updateAndGet(x -> wanted < x ? wanted : x - 1);
+    }
 }

src/org/openstreetmap/josm/io/AbstractReader.java

@@ -622 +622 @@
 
     protected OsmPrimitive buildPrimitive(PrimitiveData pd) {
         OsmPrimitive p;
-        if (pd.getUniqueId() < pd.getIdGenerator().currentUniqueId()) {
-            p = pd.getType().newInstance(pd.getUniqueId(), true);
-            pd.getIdGenerator().advanceUniqueId(pd.getUniqueId());
+        final long id = pd.getUniqueId() > 0 ? pd.getId() : pd.getIdGenerator().advanceOrGenerate(pd.getUniqueId());
+
+        if (id < 0) {
+            p = pd.getType().newInstance(id, true);
         } else {
-            p = pd.getType().newVersionedInstance(pd.getId(), pd.getVersion());
+            p = pd.getType().newVersionedInstance(id, pd.getVersion());
         }
         p.setVisible(pd.isVisible());
         p.load(pd);