Changeset 19064 in josm

Timestamp:

2024-04-27T10:24:46+02:00 (7 months ago)

Author:

GerdP

Message:

see #21881 Add a check for loops in directional waterways

• fix @since xxx
• adapt unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/algorithms/Tarjan.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/NodeGraph.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/CycleDetector.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/algorithms/Tarjan.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.algorithms;
-
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.NodeGraph;
-import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Utils;
 
 import java.util.ArrayDeque;
@@ -16 +11 @@
 import java.util.Map;
 
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeGraph;
+import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
+
 /**
  * Tarjan's strongly connected components algorithm for JOSM.
@@ -22 +22 @@
  * @see <a href="https://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algorithm">
  * Tarjan's strongly connected components algorithm</a>
- * @since xxx
+ * @since 19062
  */
 public final class Tarjan {

trunk/src/org/openstreetmap/josm/data/osm/NodeGraph.java

@@ -168 +168 @@
      *
      * @return A map representing the graph structure, where nodes are keys, and values are their direct successors.
-     * @since xxx
+     * @since 19062
      */
     public Map<Node, List<Node>> createMap() {

trunk/src/org/openstreetmap/josm/data/validation/tests/CycleDetector.java

@@ -37 +37 @@
  *
  * @author gaben
- * @since xxx
+ * @since 19062
  */
 public class CycleDetector extends Test {

trunk/test/unit/org/openstreetmap/josm/data/osm/WaySegmentTest.java

@@ -37 +37 @@
         assertEquals(WaySegment.forNodePair(w, n4, n1).getLowerIndex(), 5);
         IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> WaySegment.forNodePair(w, n3, n4));
-        assertEquals("Node pair is not part of way!", iae.getMessage());
+        assertEquals("The node pair is not consecutive part of the way!", iae.getMessage());
     }
 }