Changeset 5995 in josm for trunk

Timestamp:

2013-06-07T00:05:07+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #4445, fix #5867 - revert r3784: allow merging of duplicate nodes even with unclosed geometries, as it is really needed

File:

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

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

@@ -89 +89 @@
     protected final static int DUPLICATE_NODE_MIXED = 2;
     protected final static int DUPLICATE_NODE_OTHER = 3;
-    protected final static int DUPLICATE_NODE_UNCLOSED = 4;
     protected final static int DUPLICATE_NODE_BUILDING = 10;
     protected final static int DUPLICATE_NODE_BOUNDARY = 11;
@@ -173 +172 @@
             if (mm.get(tagSet).size() > 1) {
 
-                boolean oneWayClosed = false;
-
                 for (String type: types) {
                     typeMap.put(type, false);
@@ -187 +184 @@
                                 boolean typed = false;
                                 Way w=(Way) sp;
-                                oneWayClosed = oneWayClosed || w.isClosed();
                                 Map<String, String> keys = w.getKeys();
                                 for (String type: typeMap.keySet()) {
@@ -211 +207 @@
                 }
 
-                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) {
+                if (nbType>1) {
                     String msg = marktr("Mixed type duplicated nodes");
                     errors.add(new TestError(
@@ -429 +414 @@
         // 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;