Changeset 3698 in josm for trunk/src/org

Timestamp:

2010-12-05T16:27:41+01:00 (14 years ago)

Author:

bastiK

Message:

fixed #5701 - validator: false error "unconnected coastline" reported before upload

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java (modified) (4 diffs)

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

@@ -6 +6 @@
 import java.awt.geom.Area;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -107 +108 @@
             }
 
+            // To avoid false positives on upload (only modified primitives
+            // are visited), we have to check possible connection to ways
+            // that are not in the set of validated primitives.
+            if (headWays == 0) {
+                Collection<OsmPrimitive> refs = head.getReferrers();
+                for (OsmPrimitive ref : refs) {
+                    if (ref != c1 && isCoastline(ref)) {
+                        // ref cannot be in <code>coastlines</code>, otherwise we would
+                        // have picked it up already
+                        headWays++;
+                        next = (Way) ref;
+
+                        if (head.equals(next.firstNode())) {
+                            headReversed = true;
+                        } else if (!head.equals(next.lastNode())) {
+                            headUnordered = true;
+                        }
+                    }
+                }
+            }
+            if (tailWays == 0) {
+                Collection<OsmPrimitive> refs = tail.getReferrers();
+                for (OsmPrimitive ref : refs) {
+                    if (ref != c1 && isCoastline(ref)) {
+                        tailWays++;
+                        prev = (Way) ref;
+
+                        if (tail.equals(prev.lastNode())) {
+                            tailReversed = true;
+                        } else if (!tail.equals(prev.firstNode())) {
+                            tailUnordered = true;
+                        }
+                    }
+                }
+            }
+
             List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
             primitives.add(c1);
@@ -130 +167 @@
 
             boolean unordered = false;
-            boolean reversed = false;
-
-            if (headWays == 1 && headReversed && tailWays == 1 && tailReversed) {
-                reversed = true;
-            }
+            boolean reversed = headWays == 1 && headReversed && tailWays == 1 && tailReversed;
 
             if (headWays > 1 || tailWays > 1) {
@@ -177 +210 @@
             return;
 
-        String natural = way.get("natural");
-        if (natural == null || !natural.equals("coastline"))
-            return;
-
-        coastlines.add(way);
+        if (isCoastline(way)) {
+            coastlines.add(way);
+        }
+    }
+
+    private static boolean isCoastline(OsmPrimitive osm) {
+        return osm instanceof Way && "coastline".equals(osm.get("natural"));
     }