Changeset 35468 in osm

Timestamp:

2020-05-22T18:11:19+02:00 (4 years ago)

Author:

gerdp

Message:

fix #josm17258 Orthogonalisation problem using middle nodes selection

• select nodes in order of way

Location:

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

Files:

• MiddleNodesAction.java (modified) (2 diffs)
• NodeWayUtils.java (modified) (2 diffs)
• SelectWayNodesAction.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -44 +45 @@
         }
 
-        Set<Node> newNodes = new HashSet<>();
-        NodeWayUtils.addMiddle(selectedNodes, newNodes);
+        Set<Node> newSelectedNodes = new LinkedHashSet<>();
+        NodeWayUtils.addMiddle(selectedNodes, newSelectedNodes);
 
-        // select only newly found nodes
-        newNodes.removeAll(selectedNodes);
-        getLayerManager().getEditDataSet().addSelected(newNodes);
+        // make sure that selected nodes are in the wanted order (see #josm17258)
+        getLayerManager().getEditDataSet().clearSelection(newSelectedNodes);
+        getLayerManager().getEditDataSet().addSelected(newSelectedNodes);
     }
 

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

@@ -271 +271 @@
                 if (w.isClosed()) {
                     if ((i2-i1)*2 <= n) { // i1 ... i2
-                        for (int i = i1+1; i != i2; i++) {
+                        for (int i = i1; i != i2; i++) {
                             filteredAdd(newNodes, nodes.get(i));
                         }
+                        filteredAdd(newNodes, nodes.get(i2));
                     } else { // i2 ... n-1 0 1 ... i1
-                        for (int i = i2+1; i != i1; i = (i+1) % n) {
+                        for (int i = i2; i != i1; i = (i+1) % n) {
                             filteredAdd(newNodes, nodes.get(i));
                         }
+                        filteredAdd(newNodes, nodes.get(i1));
                     }
                 } else {
-                    for (int i = i1+1; i < i2; i++) {
+                    for (int i = i1; i <= i2; i++) {
                         filteredAdd(newNodes, nodes.get(i));
                     }
@@ -286 +288 @@
             }
         }
-        if (newNodes.isEmpty()) {
+        if (newNodes.size() <= 2) {
             new Notification(
                     tr("Please select two nodes connected by way!")

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -39 +39 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Set<Node> selectedNodes = new HashSet<>();
+        Set<Node> selectedNodes = new LinkedHashSet<>();
 
         for (OsmPrimitive p : getLayerManager().getEditDataSet().getSelected()) {