Changeset 14494 in josm for trunk

Timestamp:

2018-12-02T17:00:07+01:00 (5 years ago)

Author:

GerdP

Message:

fix #17057

• Allow multiple from ways in no_entry turn restriction
• Allow multiple to ways in no_exit turn restriction
• Don't check turn restrictions in RelationChecker when TurnrestrictionTest is enabled

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• RelationChecker.java (modified) (3 diffs)
• TurnrestrictionTest.java (modified) (3 diffs)

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

@@ -64 +64 @@
     public static final String ROLE_VERIF_PROBLEM_MSG = tr("Role verification problem");
     private boolean ignoreMultiPolygons;
+    private boolean ignoreTurnRestrictions;
 
     /**
@@ -109 +110 @@
             if (t instanceof MultipolygonTest) {
                 ignoreMultiPolygons = true;
-                break;
+            }
+            if (t instanceof TurnrestrictionTest) {
+                ignoreTurnRestrictions = true;
             }
         }
@@ -125 +128 @@
         if (ignoreMultiPolygons && n.isMultipolygon()) {
             // see #17010: don't report same problem twice
+            return;
+        }
+        if (ignoreTurnRestrictions && n.hasTag("type","restriction")) {
+            // see #17057: TurnrestrictionTest is specialized on this
             return;
         }

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

@@ -130 +130 @@
             }
         }
+        final String restriction = r.get("restriction");
         if (morefrom) {
-            errors.add(TestError.builder(this, Severity.ERROR, MORE_FROM)
+            Severity severity = "no_entry".equals(restriction) ? Severity.OTHER : Severity.ERROR;
+            errors.add(TestError.builder(this, severity, MORE_FROM)
                     .message(tr("More than one \"from\" way found"))
                     .primitives(r)
@@ -137 +139 @@
         }
         if (moreto) {
-            errors.add(TestError.builder(this, Severity.ERROR, MORE_TO)
+            Severity severity = "no_exit".equals(restriction) ? Severity.OTHER : Severity.ERROR;
+            errors.add(TestError.builder(this, severity, MORE_TO)
                     .message(tr("More than one \"to\" way found"))
                     .primitives(r)
@@ -170 +173 @@
         }
         if (fromWay.equals(toWay)) {
-            Severity severity = r.hasTag("restriction", "no_u_turn") ? Severity.OTHER : Severity.WARNING;
+            Severity severity = "no_u_turn".equals(restriction) ? Severity.OTHER : Severity.WARNING;
             errors.add(TestError.builder(this, severity, FROM_EQUALS_TO)
                     .message(tr("\"from\" way equals \"to\" way"))