Ticket #22808: 22808.2.patch

src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -127 +128 @@
             createdPrimitives = PurgeCommand.topoSort(createdPrimitives);
         }
         // reversed order, see #14620
+        List<PrimitiveId> toRemove = new ArrayList<>(this.createdPrimitives.size());
         for (int i = createdPrimitives.size() - 1; i >= 0; i--) {
             OsmPrimitive osm = createdPrimitives.get(i);
             Optional<PrimitiveData> previous = preExistingData.stream()
@@ -134 +136 @@
             if (previous.isPresent()) {
                 osm.load(previous.get());
             } else {
+                toRemove.add(osm);
                 ds.removePrimitive(osm);
             }
         }
+        ds.removePrimitives(toRemove);
     }
 
     @Override

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

@@ -5 +5 @@
 
 import java.awt.geom.Area;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -564 +565 @@
         });
     }
 
+    /**
+     * Removes primitives from the dataset. This method only removes the
+     * primitives form the respective collection of primitives managed
+     * by this dataset, i.e. from {@code store.nodes}, {@code store.ways}, or
+     * {@code store.relations}. References from other primitives to this
+     * primitive are left unchanged.
+     *
+     * @param primitiveIds the ids of the primitive
+     * @throws IllegalStateException if the dataset is read-only
+     * @since xxx
+     */
+    public void removePrimitives(PrimitiveId... primitiveIds) {
+        this.removePrimitives(Arrays.asList(primitiveIds));
+    }
+
+    /**
+     * Removes primitives from the dataset. This method only removes the
+     * primitives form the respective collection of primitives managed
+     * by this dataset, i.e. from {@code store.nodes}, {@code store.ways}, or
+     * {@code store.relations}. References from other primitives to this
+     * primitive are left unchanged.
+     *
+     * @param primitiveIds the ids of the primitive
+     * @throws IllegalStateException if the dataset is read-only
+     * @since xxx
+     */
+    public void removePrimitives(Collection<PrimitiveId> primitiveIds) {
+        checkModifiable();
+        update(() -> {
+            final List<OsmPrimitive> removed = new ArrayList<>(primitiveIds.size());
+            for (PrimitiveId primitiveId : primitiveIds) {
+                OsmPrimitive primitive = this.getPrimitiveByIdChecked(primitiveId);
+                if (primitive == null) {
+                    continue;
+                }
+                removePrimitiveImpl(primitive);
+                removed.add(primitive);
+            }
+            firePrimitivesRemoved(removed, false);
+        });
+    }
+
     private void removePrimitiveImpl(OsmPrimitive primitive) {
         clearSelection(primitive.getPrimitiveId());
         if (primitive.isSelected()) {