Changeset 15728 in josm

Timestamp:

2020-01-19T10:54:23+01:00 (3 years ago)

Author:

simon04

Message:

fix #18477 - Split Way: smart way selection

If only one highway/railway/waterway is applicable, use that one.

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -16 +16 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 import javax.swing.DefaultListCellRenderer;
@@ -103 +104 @@
         if (applicableWays.size() > 1) {
              applicableWays.removeIf(w -> selectedNodes.stream().noneMatch(w::isInnerNode));
+        }
+
+        // Smart way selection: if only one highway/railway/waterway is applicable, use that one
+        if (applicableWays.size() > 1) {
+            final List<Way> mainWays = applicableWays.stream()
+                    .filter(w -> w.hasKey("highway", "railway", "waterway"))
+                    .collect(Collectors.toList());
+            if (mainWays.size() == 1) {
+                applicableWays = mainWays;
+            }
         }
 

trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java

@@ -7 +7 @@
 import java.util.Arrays;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -20 +21 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Unit tests for class {@link SplitWayAction}.
@@ -33 +32 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().projection();
+    private final DataSet dataSet = new DataSet();
+
+    private Node addNode(int east, int north) {
+        final Node node = new Node(new EastNorth(east, north));
+        dataSet.addPrimitive(node);
+        return node;
+    }
 
     /**
@@ -40 +46 @@
     @Test
     public void testTicket11184() {
-        DataSet dataSet = new DataSet();
-
-        Node n1 = new Node(new EastNorth(0, 0));
-        Node n2 = new Node(new EastNorth(-1, 1));
-        Node n3 = new Node(new EastNorth(1, 1));
-        Node n4 = new Node(new EastNorth(-1, -1));
-        Node n5 = new Node(new EastNorth(1, -1));
-        Node n6 = new Node(new EastNorth(-1, 0));
-        Node n7 = new Node(new EastNorth(1, 0));
-        dataSet.addPrimitive(n1);
-        dataSet.addPrimitive(n2);
-        dataSet.addPrimitive(n3);
-        dataSet.addPrimitive(n4);
-        dataSet.addPrimitive(n5);
-        dataSet.addPrimitive(n6);
-        dataSet.addPrimitive(n7);
+        Node n1 = addNode(0, 0);
+        Node n2 = addNode(-1, 1);
+        Node n3 = addNode(1, 1);
+        Node n4 = addNode(-1, -1);
+        Node n5 = addNode(1, -1);
+        Node n6 = addNode(-1, 0);
+        Node n7 = addNode(1, 0);
 
         Way w1 = new Way();
@@ -96 +93 @@
                 new Node(new LatLon(0.00033, 0.00033)), new Node(new LatLon(0.00066, 0.00066)),
                 new Node(new LatLon(0.001, 0.001)));
-        from.getNodes().forEach(node -> dataSet.addPrimitive(node));
+        from.getNodes().forEach(dataSet::addPrimitive);
         dataSet.addPrimitive(from);
         Node via = from.lastNode();
@@ -119 +116 @@
         }
     }
+
+    /**
+     * Test case: smart way selection
+     * see #18477
+     */
+    @Test
+    public void testTicket18477() {
+        final Node n10 = addNode(1, 0);
+        final Node n21 = addNode(2, 1);
+        final Way highway = TestUtils.newWay("highway=residential",
+                addNode(0, 0), n10, n21, addNode(3, 1));
+        final Way bridge = TestUtils.newWay("man_made=bridge",
+                n10, addNode(2, 0), n21, addNode(1, 1), n10);
+        dataSet.addPrimitive(highway);
+        dataSet.addPrimitive(bridge);
+        dataSet.setSelected(n10, n21);
+        SplitWayAction.runOn(dataSet);
+        assertSame(String.format("Found %d ways after split action instead of 4.", dataSet.getWays().size()),
+                dataSet.getWays().size(), 4);
+    }
 }