Changeset 3784 in josm for trunk/src/org

Timestamp:

2011-01-11T00:30:13+01:00 (14 years ago)

Author:

framm

Message:

fix duplicate node test. check introduced in r3871 did not achieve desired result.
introduced new error type "duplicate nodes in two un-closed ways".
never allow merging of nodes if both are part of an un-closed way (e.g. two roads crossing),
but allow merging if at least one way is closed (e.g. landuse/landuse).

File:

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

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

@@ -85 +85 @@
     protected static int DUPLICATE_NODE_MIXED = 2;
     protected static int DUPLICATE_NODE_OTHER = 3;
+    protected static int DUPLICATE_NODE_UNCLOSED = 4;
     protected static int DUPLICATE_NODE_BUILDING = 10;
     protected static int DUPLICATE_NODE_BOUNDARY = 11;
@@ -155 +156 @@
             if (mm.get(tagSet).size() > 1) {
 
+                boolean oneWayClosed = false;
+
                 for (String type: types) {
                     typeMap.put(type, false);
@@ -167 +170 @@
                                 boolean typed = false;
                                 Way w=(Way) sp;
+                                oneWayClosed = oneWayClosed || w.isClosed();
                                 Map<String, String> keys = w.getKeys();
                                 for (String type: typeMap.keySet()) {
@@ -190 +194 @@
                 }
 
-                if (nbType>1) {
+                if (!oneWayClosed) {
+                    String msg = marktr("Duplicate nodes in two un-closed ways");
+                    errors.add(new TestError(
+                            parentTest,
+                            Severity.WARNING,
+                            tr("Duplicated nodes"),
+                            tr(msg),
+                            msg,
+                            DUPLICATE_NODE_UNCLOSED,
+                            mm.get(tagSet)
+                    ));
+                } else if (nbType>1) {
                     String msg = marktr("Mixed type duplicated nodes");
                     errors.add(new TestError(
@@ -384 +399 @@
     @Override
     public boolean isFixable(TestError testError) {
-        return (testError.getTester() instanceof DuplicateNode && testError.getSeverity() == Severity.ERROR);
+        if (!(testError.getTester() instanceof DuplicateNode)) return false;
+        // never merge nodes with different tags.
+        if (testError.getCode() == DUPLICATE_NODE) return false;
+        // never merge nodes from two different non-closed geometries
+        if (testError.getCode() == DUPLICATE_NODE_UNCLOSED) return false;
+        // everything else is ok to merge
+        return true;
     }