Changeset 13229 in josm for trunk

Timestamp:

2017-12-23T00:33:34+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15688 - do not filter selected way nodes in draw mode

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -1313 +1313 @@
     public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
         DataSet ds = getLayerManager().getEditDataSet();
-        return ds != null ? ds.getSelected() : Collections.emptySet();
+        if (ds != null) {
+            // Preserves selected primitives and selected way nodes
+            Set<OsmPrimitive> result = new HashSet<>();
+            for (Way w : ds.getSelectedWays()) {
+                result.addAll(w.getNodes());
+            }
+            result.addAll(ds.getSelected());
+            return result;
+        }
+        return Collections.emptySet();
     }