Changeset 6619 in josm for trunk

Timestamp:

2014-01-04T01:51:27+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9523 - validator: Only raise "Way contains segment twice" error if at least two nodes are found twice

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/WaySegment.java (modified) (5 diffs)
• validation/tests/OverlappingWays.java (modified) (2 diffs)

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

@@ -8 +8 @@
  */
 public final class WaySegment implements Comparable<WaySegment> {
+    
     /**
      * The way.
@@ -19 +20 @@
     public int lowerIndex;
 
+    /**
+     * Constructs a new {@code WaySegment}.
+     * @param w The way
+     * @param i The node lower index
+     */
     public WaySegment(Way w, int i) {
         way = w;
@@ -51 +57 @@
     }
 
-    @Override public boolean equals(Object o) {
+    @Override
+    public boolean equals(Object o) {
         return o instanceof WaySegment
             && ((WaySegment) o).way == way
@@ -57 +64 @@
     }
 
-    @Override public int hashCode() {
+    @Override
+    public int hashCode() {
         return way.hashCode() ^ lowerIndex;
     }
@@ -83 +91 @@
                 s2.getSecondNode().getEastNorth().east(), s2.getSecondNode().getEastNorth().north());
     }
+
+    @Override
+    public String toString() {
+        return "WaySegment [way=" + way.getId() + ", lowerIndex=" + lowerIndex + "]";
+    }
 }

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

@@ -158 +158 @@
             @Override
             public int compare(WaySegment o1, WaySegment o2) {
-                return o1.way.getNode(o1.lowerIndex).compareTo(o2.way.getNode(o2.lowerIndex));
+                return o1.getFirstNode().compareTo(o2.getFirstNode());
             }
         });
         final Set<Integer> wayNodesToFix = new TreeSet<Integer>(Collections.reverseOrder());
+        
         for (int i = 0; i < w.getNodesCount() - 1; i++) {
             final boolean wasInSet = !segments.add(new WaySegment(w, i));
@@ -168 +169 @@
             }
         }
-        if (!wayNodesToFix.isEmpty()) {
+        if (wayNodesToFix.size() > 1) {
             final List<Node> newNodes = new ArrayList<Node>(w.getNodes());
             for (final int i : wayNodesToFix) {