Changeset 35613 in osm for applications

Timestamp:

2020-10-25T10:36:13+01:00 (4 years ago)

Author:

GerdP

Message:

fix #19280 Select all inside: Child Nodes of inside ways not selected

• change parameter for selectAllInside() to select nodes in ways
• don't filter nodes in method addAllInsideMultipolygon(), let selectAllInside() decide if nodes are wanted

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection

Files:

• NodeWayUtils.java (modified) (2 diffs)
• SelectAllInsideAction.java (modified) (2 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java

@@ -395 +395 @@
             }
         }
-        for (Way w : newestWays) {
-            newestNodes.removeAll(w.getNodes());
-            // do not select nodes of already selected ways
-        }
-
         filteredAddAll(newNodes, newestNodes);
         newWays.addAll(newestWays); // already filtered
@@ -488 +483 @@
     }
 
+    /**
+     * Compute ways inside selected polygons.
+     * @param selected the selected polygons and maybe other elements
+     * @param dataset the dataset
+     * @return ways inside selected polygons
+     */
     public static Collection<OsmPrimitive> selectAllInside(Collection<OsmPrimitive> selected, DataSet dataset) {
         return selectAllInside(selected, dataset, true);
     }
 
+    /**
+     * Compute elements (ways, nodes) inside selected polygons.
+     * @param selected the selected polygons and maybe other elements
+     * @param dataset the dataset
+     * @param ignoreNodesOfFoundWays if {@code true}, the result will not contain the nodes of the computed ways.
+     * @return ways inside selected polygons, if wanted also the nodes.
+     */
     public static Set<OsmPrimitive> selectAllInside(Collection<OsmPrimitive> selected, DataSet dataset, boolean ignoreNodesOfFoundWays) {
         Set<Way> newWays = new HashSet<>();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java

@@ -23 +23 @@
 public class SelectAllInsideAction extends JosmAction {
 
+    /**
+     * Constructs a new {@code SelectAllInsideAction}.
+     */
     public SelectAllInsideAction() {
         super(tr("All inside [testing]"), "selinside", tr("Select all inside selected polygons"),
@@ -33 +36 @@
     public void actionPerformed(ActionEvent e) {
         DataSet ds = getLayerManager().getActiveDataSet();
-        Collection<OsmPrimitive> insideSelected = NodeWayUtils.selectAllInside(ds.getSelected(), ds, true);
+        Collection<OsmPrimitive> insideSelected = NodeWayUtils.selectAllInside(ds.getSelected(), ds, false);
 
         if (!insideSelected.isEmpty()) {