Changeset 35470 in osm for applications/editors/josm/plugins/utilsplugin2/src

Timestamp:

2020-05-24T10:05:31+02:00 (4 years ago)

Author:

gerdp

Message:

see #josm18735: Middle nodes does not use selected way
see #josm17258: Orthogonalisation problem using middle nodes selection (fix also AdjacentNodesAction)

Location:

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

Files:

• AdjacentNodesAction.java (modified) (3 diffs)
• NodeWayUtils.java (modified) (1 diff)

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

@@ -33 +33 @@
     }
 
-    private Set<Way> activeWays = new HashSet<>();
+    private transient Set<Way> activeWays = new HashSet<>();
 
     @Override
@@ -60 +60 @@
         // selecting nodes of selected ways
         if (selectedNodes.isEmpty()) {
-            HashSet<Node> newNodes = new HashSet<>();
+            Set<Node> newNodes = new LinkedHashSet<>();
             NodeWayUtils.addNodesConnectedToWays(selectedWays, newNodes);
             activeWays.clear();
@@ -71 +71 @@
         }
 
-        Set<Node> newNodes = new HashSet<>();
+        Set<Node> newNodes = new LinkedHashSet<>();
         for (Node node: selectedNodes) {
             for (Way w: activeWays) {

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

@@ -258 +258 @@
         Set<Way> ways = new HashSet<>();
         ways.addAll(n1.getParentWays());
+        if (ways.stream().anyMatch(Way::isSelected)) {
+            // see #josm18735: use only selected ways
+            ways.removeIf(w -> !w.isSelected());
+        }
         for (Way w: ways) {