Changeset 33413 in osm for applications/editors/josm/plugins/pt_assistant/test/unit

Timestamp:

2017-06-23T22:52:03+02:00 (8 years ago)

Author:

giackserva

Message:

[pt_assistant] #josm14933 - now supports multiple instances of the roundabout inside the same relation

File:

• applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java (modified) (6 diffs)

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java

@@ -41 +41 @@
     private OsmDataLayer layer;
     private SplitRoundaboutAction action;
-    private Way r1, r2, r3;
+    private Way r1, r2, r3, r4;
 
     @Before
@@ -54 +54 @@
         r2 = (Way) ds.getPrimitiveById(new SimplePrimitiveId(205833435L, OsmPrimitiveType.WAY));
         r3 = (Way) ds.getPrimitiveById(new SimplePrimitiveId(25739002L, OsmPrimitiveType.WAY));
+        r4 = (Way) ds.getPrimitives(p -> p.hasTag("name", "r4")).iterator().next();
     }
 
     private Collection<Way> splitWay(Way w) {
-        Map<Relation, Integer> savedPositions = action.getSavedPositions(w);
+        Map<Relation, List<Integer>> savedPositions = action.getSavedPositions(w);
         List<Node> splitNodes = action.getSplitNodes(w);
-        assertEquals(4, splitNodes.size());
         SplitWayResult result = SplitWayAction.split(layer, w, splitNodes, Collections.emptyList());
         result.getCommand().executeCommand();
         Collection<Way> splitWays = result.getNewWays();
+        splitWays.add(result.getOriginalWay());
         action.updateRelations(savedPositions, splitNodes, splitWays);
         return splitWays;
@@ -69 +70 @@
     @Test
     public void test1() {
-        splitWay(r1).forEach(w -> {
-                if (w.firstNode().getUniqueId() == 267843779L && w.lastNode().getUniqueId() == 2968718407L)
+        Collection<Way> sw1 = splitWay(r1);
+        assertEquals(4, sw1.size());
+        sw1.forEach(w -> {
+            if (w.firstNode().getUniqueId() == 267843779L && w.lastNode().getUniqueId() == 2968718407L)
                 assertEquals(w.getReferrers().size(), 5);
             else if (w.firstNode().getUniqueId() == 2968718407L && w.lastNode().getUniqueId() == 2383688231L)
@@ -85 +88 @@
     @Test
     public void test2() {
-        splitWay(r2).forEach(w -> {
+        Collection<Way> sw2 = splitWay(r2);
+        assertEquals(4, sw2.size());
+        sw2.forEach(w -> {
             if(w.firstNode().getUniqueId() == 2158181809L && w.lastNode().getUniqueId() == 2158181798L)
                 assertEquals(w.getReferrers().size(), 8);
@@ -101 +106 @@
     @Test
     public void test3() {
-        splitWay(r3).forEach(w -> {
+        Collection<Way> sw3 = splitWay(r3);
+        assertEquals(4, sw3.size());
+        sw3.forEach(w -> {
             if(w.firstNode().getUniqueId() == 280697532L && w.lastNode().getUniqueId() == 280697452L)
                 assertEquals(w.getReferrers().size(), 0);
@@ -114 +121 @@
         });
     }
+
+    @Test
+    public void test4() {
+        Collection<Way> sw4 = splitWay(r4);
+        assertEquals(10, sw4.size());
+        Node entry11 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nentry1-1")).iterator().next();
+        Node exit11 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nexit1-1")).iterator().next();
+        Node entry12 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nentry1-2")).iterator().next();
+        Node exit12 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nexit1-2")).iterator().next();
+        Node entry21 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nentry2-1")).iterator().next();
+        Node exit21 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nexit2-1")).iterator().next();
+        Node entry22 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nentry2-2")).iterator().next();
+        Node exit22 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nexit2-2")).iterator().next();
+        Node entry3 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nentry3")).iterator().next();
+        Node exit3 = (Node) ds.getPrimitives(p -> p.hasTag("name", "nexit3")).iterator().next();
+
+        sw4.forEach(w -> {
+            if(w.firstNode().equals(entry11) && w.lastNode().equals(exit22))
+                assertEquals(2, w.getReferrers().size());
+            else if(w.firstNode().equals(exit22) && w.lastNode().equals(entry21))
+                assertEquals(1, w.getReferrers().size());
+            else if(w.firstNode().equals(entry21) && w.lastNode().equals(exit11))
+                assertEquals(2, w.getReferrers().size());
+            else if(w.firstNode().equals(exit11) && w.lastNode().equals(entry12))
+                assertEquals(1, w.getReferrers().size());
+            else if(w.firstNode().equals(entry12) && w.lastNode().equals(entry3))
+                assertEquals(2, w.getReferrers().size());
+            else if(w.firstNode().equals(entry3) && w.lastNode().equals(exit21))
+                assertEquals(3, w.getReferrers().size());
+            else if(w.firstNode().equals(exit21) && w.lastNode().equals(entry22))
+                assertEquals(2, w.getReferrers().size());
+            else if(w.firstNode().equals(entry22) && w.lastNode().equals(exit3))
+                assertEquals(3, w.getReferrers().size());
+            else if(w.firstNode().equals(exit3) && w.lastNode().equals(exit12))
+                assertEquals(2, w.getReferrers().size());
+            else if(w.firstNode().equals(exit12) && w.lastNode().equals(entry11))
+                assertEquals(1, w.getReferrers().size());
+            else
+                fail();
+        });
+    }
 }