Support ";" access delimiter for car access. (graphhopper#2655)

* Support ";" access delimiter for car access.
One example is motor_vehicle = agricultural;forestry

* Add support for ";" access delimiter for MotorcycleTagParser and road_access EV.

* Move logic for access delimiter handling for ";" from RoadAccess into OSMRoadAccessParser

* Fix for OSMRoadAccessParserTest

Author: ratrun

core/src/main/java/com/graphhopper/routing/util/CarTagParser.java

@@ -195,10 +195,14 @@ public WayAccess getAccess(ReaderWay way) {
 
         // multiple restrictions needs special handling compared to foot and bike, see also motorcycle
         if (!firstValue.isEmpty()) {
-            if (restrictedValues.contains(firstValue) && !getConditionalTagInspector().isRestrictedWayConditionallyPermitted(way))
-                return WayAccess.CAN_SKIP;
-            if (intendedValues.contains(firstValue))
-                return WayAccess.WAY;
+            String[] restrict = firstValue.split(";");
+            boolean notConditionalyPermitted = !getConditionalTagInspector().isRestrictedWayConditionallyPermitted(way);
+            for (String value: restrict) {
+                if (restrictedValues.contains(value) && notConditionalyPermitted)
+                    return WayAccess.CAN_SKIP;
+                if (intendedValues.contains(value))
+                    return WayAccess.WAY;
+            }
         }
 
         // do not drive street cars into fords

core/src/main/java/com/graphhopper/routing/util/MotorcycleTagParser.java

@@ -145,10 +145,14 @@ public WayAccess getAccess(ReaderWay way) {
             return WayAccess.CAN_SKIP;
 
         if (!firstValue.isEmpty()) {
-            if (restrictedValues.contains(firstValue) && !getConditionalTagInspector().isRestrictedWayConditionallyPermitted(way))
-                return WayAccess.CAN_SKIP;
-            if (intendedValues.contains(firstValue))
-                return WayAccess.WAY;
+            String[] restrict = firstValue.split(";");
+            boolean notConditionalyPermitted = !getConditionalTagInspector().isRestrictedWayConditionallyPermitted(way);
+            for (String value: restrict) {
+                if (restrictedValues.contains(value) && notConditionalyPermitted)
+                    return WayAccess.CAN_SKIP;
+                if (intendedValues.contains(value))
+                    return WayAccess.WAY;
+            }
         }
 
         // do not drive street cars into fords

core/src/main/java/com/graphhopper/routing/util/parsers/OSMRoadAccessParser.java

@@ -43,9 +43,15 @@ public IntsRef handleWayTags(IntsRef edgeFlags, ReaderWay readerWay, IntsRef rel
         RoadAccess accessValue = YES;
         RoadAccess tmpAccessValue;
         for (String restriction : restrictions) {
-            tmpAccessValue = RoadAccess.find(readerWay.getTag(restriction, "yes"));
-            if (tmpAccessValue != null && tmpAccessValue.ordinal() > accessValue.ordinal()) {
-                accessValue = tmpAccessValue;
+            String tagValue = readerWay.getTag(restriction);
+            if (tagValue != null) {
+                String[] complex = tagValue.split(";");
+                for ( String simple: complex) {
+                   tmpAccessValue = RoadAccess.find(simple);
+                   if (tmpAccessValue != null && tmpAccessValue.ordinal() > accessValue.ordinal()) {
+                       accessValue = tmpAccessValue;
+                   }
+                }
             }
         }
 

core/src/test/java/com/graphhopper/reader/osm/conditional/ConditionalOSMTagInspectorTest.java

@@ -44,10 +44,10 @@ private static Set<String> getSampleRestrictedValues() {
     }
 
     private static Set<String> getSamplePermissiveValues() {
-        Set<String> restrictedValues = new HashSet<>();
-        restrictedValues.add("yes");
-        restrictedValues.add("permissive");
-        return restrictedValues;
+        Set<String> permissiveValues = new HashSet<>();
+        permissiveValues.add("yes");
+        permissiveValues.add("permissive");
+        return permissiveValues;
     }
 
     private static List<String> getSampleConditionalTags() {

core/src/test/java/com/graphhopper/routing/util/CarTagParserTest.java

@@ -111,6 +111,19 @@ public void testAccess() {
         way.setTag("motor_vehicle", "no");
         assertTrue(parser.getAccess(way).canSkip());
 
+        way.clearTags();
+        way.setTag("highway", "track");
+        way.setTag("motor_vehicle", "agricultural");
+        assertTrue(parser.getAccess(way).canSkip());
+        way.setTag("motor_vehicle", "agricultural;forestry");
+        assertTrue(parser.getAccess(way).canSkip());
+        way.setTag("motor_vehicle", "forestry;agricultural");
+        assertTrue(parser.getAccess(way).canSkip());
+        way.setTag("motor_vehicle", "forestry;agricultural;unknown");
+        assertTrue(parser.getAccess(way).canSkip());
+        way.setTag("motor_vehicle", "yes;forestry;agricultural");
+        assertTrue(parser.getAccess(way).isWay());
+
         way.clearTags();
         way.setTag("highway", "service");
         way.setTag("access", "no");

core/src/test/java/com/graphhopper/routing/util/MotorcycleTagParserTest.java

@@ -114,6 +114,8 @@ public void testAccess() {
         way.setTag("access", "yes");
         way.setTag("motor_vehicle", "no");
         assertTrue(parser.getAccess(way).canSkip());
+        way.setTag("motor_vehicle", "agricultural;forestry");
+        assertTrue(parser.getAccess(way).canSkip());
 
         way.clearTags();
         way.setTag("highway", "service");

core/src/test/java/com/graphhopper/routing/util/parsers/OSMRoadAccessParserTest.java

@@ -55,6 +55,15 @@ public RoadAccess getAccess(ReaderWay readerWay, TransportationMode transportati
         way.removeTag("country_rule");
         parser.handleWayTags(edgeFlags, way, relFlags);
         assertEquals(RoadAccess.YES, roadAccessEnc.getEnum(false, edgeFlags));
+
+        way.setTag("motor_vehicle", "agricultural;forestry");
+        parser.handleWayTags(edgeFlags, way, relFlags);
+        assertEquals(RoadAccess.AGRICULTURAL, roadAccessEnc.getEnum(false, edgeFlags));
+
+        way.setTag("motor_vehicle", "forestry;agricultural");
+        parser.handleWayTags(edgeFlags, way, relFlags);
+        assertEquals(RoadAccess.AGRICULTURAL, roadAccessEnc.getEnum(false, edgeFlags));
+
     }
 
 }