Changeset 15071 in josm for trunk/src

Timestamp:

2019-05-11T21:15:10+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17709 - make TurnrestrictionTest aware of conditional restrictions

Location:

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

Files:

• ConditionalKeys.java (modified) (2 diffs)
• TurnrestrictionTest.java (modified) (3 diffs)

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

@@ -38 +38 @@
             /*,"hov","emergency","hazmat","disabled"*/));
 
+    private static final Pattern CONDITIONAL_PATTERN;
+    static {
+        final String part = Pattern.compile("([^@\\p{Space}][^@]*?)"
+                + "\\s*@\\s*" + "(\\([^)\\p{Space}][^)]+?\\)|[^();\\p{Space}][^();]*?)\\s*").toString();
+        CONDITIONAL_PATTERN = Pattern.compile('(' + part + ")(;\\s*" + part + ")*");
+    }
+
     /**
      * Constructs a new {@code ConditionalKeys}.
@@ -164 +171 @@
             // <restriction-value> @ <condition>[;<restriction-value> @ <condition>]
             final List<ConditionalValue> r = new ArrayList<>();
-            final String part = Pattern.compile("([^@\\p{Space}][^@]*?)"
-                    + "\\s*@\\s*" + "(\\([^)\\p{Space}][^)]+?\\)|[^();\\p{Space}][^();]*?)\\s*").toString();
-            final Matcher m = Pattern.compile('(' + part + ")(;\\s*" + part + ")*").matcher(value);
+            final Matcher m = CONDITIONAL_PATTERN.matcher(value);
             if (!m.matches()) {
                 throw new ConditionalParsingException(tr("Does not match pattern ''restriction value @ condition''"));

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.data.validation.tests.ConditionalKeys.ConditionalParsingException;
+import org.openstreetmap.josm.data.validation.tests.ConditionalKeys.ConditionalValue;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -56 +59 @@
     }
 
+    private static boolean hasSupportedRestrictionTag(Relation r) {
+        if (r.hasTag("restriction", SUPPORTED_RESTRICTIONS))
+            return true;
+        String conditionalValue = r.get("restriction:conditional");
+        if (conditionalValue != null) {
+            try {
+                List<ConditionalValue> values = ConditionalValue.parse(conditionalValue);
+                return !values.isEmpty() && SUPPORTED_RESTRICTIONS.contains(values.get(0).restrictionValue);
+            } catch (ConditionalParsingException e) {
+                Logging.trace(e);
+            }
+        }
+        return false;
+    }
+
     @Override
     public void visit(Relation r) {
@@ -61 +79 @@
             return;
 
-        if (!r.hasTag("restriction", SUPPORTED_RESTRICTIONS)) {
+        if (!hasSupportedRestrictionTag(r)) {
             errors.add(TestError.builder(this, Severity.ERROR, UNKNOWN_RESTRICTION)
                     .message(tr("Unknown turn restriction"))