Commit further changes as suggested in review

ratrun · Jun 10, 2024 · a6d14ff · a6d14ff
1 parent db4dd8a
commit a6d14ff
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAccessParser.java b/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAccessParser.java
@@ -82,14 +82,9 @@ public WayAccess getAccess(ReaderWay way) {
 
         int firstIndex = way.getFirstIndex(restrictionKeys);
         if (firstIndex >= 0) {
-            String firstRestrictedKey = restrictionKeys.get(firstIndex);
-            String firstValue = way.getTag(firstRestrictedKey, "");
+            String firstValue = way.getTag(restrictionKeys.get(firstIndex), "");
             String[] restrict = firstValue.split(";");
             for (String value : restrict) {
-                if (value.equals("no")) {
-                    if (firstRestrictedKey.equals("vehicle"))
-                        return WayAccess.WAY;
-                }
                 if (restrictedValues.contains(value) && !hasTemporalRestriction(way, firstIndex, restrictionKeys))
                     return WayAccess.CAN_SKIP;
                 if (intendedValues.contains(value))

diff --git a/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAverageSpeedParser.java b/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAverageSpeedParser.java
@@ -25,6 +25,7 @@ public abstract class BikeCommonAverageSpeedParser extends AbstractAverageSpeedP
     private final Map<String, Integer> highwaySpeeds = new HashMap<>();
     private final EnumEncodedValue<Smoothness> smoothnessEnc;
     protected final Set<String> intendedValues = new HashSet<>(5);
+    protected final Set<String> restrictedValues = new HashSet<>(8);
 
     protected BikeCommonAverageSpeedParser(DecimalEncodedValue speedEnc, EnumEncodedValue<Smoothness> smoothnessEnc, DecimalEncodedValue ferrySpeedEnc) {
         super(speedEnc, ferrySpeedEnc);
@@ -116,6 +117,15 @@ protected BikeCommonAverageSpeedParser(DecimalEncodedValue speedEnc, EnumEncoded
         intendedValues.add("designated");
         intendedValues.add("official");
         intendedValues.add("permissive");
+
+        restrictedValues.add("no");
+        restrictedValues.add("agricultural");
+        restrictedValues.add("forestry");
+        restrictedValues.add("restricted");
+        restrictedValues.add("military");
+        restrictedValues.add("emergency");
+        restrictedValues.add("private");
+        restrictedValues.add("permit");
     }
 
     /**
@@ -188,7 +198,17 @@ else if (way.hasTag("highway", pushingSectionsHighways)
             }
         }
 
-        if (way.hasTag("vehicle", "no") && !way.hasTag("bicycle", intendedValues))
+        boolean pushing_restriction = false;
+        String vehicleValue = way.getTag("vehicle", "");
+        String[] splitVehicleValues = vehicleValue.split(";");
+        for (String value : splitVehicleValues) {
+             if (restrictedValues.contains(value)) {
+                 pushing_restriction = true;
+                 break;
+             }
+        }
+
+        if (pushing_restriction && !way.hasTag("bicycle", intendedValues))
             speed = PUSHING_SECTION_SPEED;
 
         // Until now we assumed that the way is no pushing section

diff --git a/core/src/main/java/com/graphhopper/routing/util/parsers/OSMGetOffBikeParser.java b/core/src/main/java/com/graphhopper/routing/util/parsers/OSMGetOffBikeParser.java
@@ -32,7 +32,7 @@ public OSMGetOffBikeParser(BooleanEncodedValue getOffBikeEnc, BooleanEncodedValu
     @Override
     public void handleWayTags(int edgeId, EdgeIntAccess edgeIntAccess, ReaderWay way, IntsRef relationFlags) {
         String highway = way.getTag("highway");
-        String vehicle = way.getTag("vehicle") == null ? "" : way.getTag("vehicle");
+        String vehicle = way.getTag("vehicle", "");
         boolean notIntended = !way.hasTag("bicycle", INTENDED) &&
                 (GET_OFF_BIKE.contains(highway)
                         || way.hasTag("railway", "platform")

diff --git a/core/src/test/java/com/graphhopper/routing/util/parsers/AbstractBikeTagParserTester.java b/core/src/test/java/com/graphhopper/routing/util/parsers/AbstractBikeTagParserTester.java
@@ -152,6 +152,8 @@ public void testAccess() {
         assertTrue(accessParser.getAccess(way).canSkip());
         way.setTag("bicycle", "no");
         assertTrue(accessParser.getAccess(way).canSkip());
+        way.setTag("bicycle", "yes");
+        assertTrue(accessParser.getAccess(way).isWay());
 
         way.setTag("highway", "path");
         way.setTag("bicycle", "yes");

diff --git a/core/src/test/java/com/graphhopper/routing/util/parsers/BikeTagParserTest.java b/core/src/test/java/com/graphhopper/routing/util/parsers/BikeTagParserTest.java
@@ -197,7 +197,13 @@ public void testSpeedAndPriority() {
         way.clearTags();
         way.setTag("highway", "track");
         assertPriorityAndSpeed(UNCHANGED, 12, way);
+        way.setTag("vehicle", "no");
+        assertPriorityAndSpeed(UNCHANGED, PUSHING_SECTION_SPEED, way);
+        way.setTag("vehicle", "forestry;agricultural");
+        assertPriorityAndSpeed(UNCHANGED, PUSHING_SECTION_SPEED, way);
 
+        way.clearTags();
+        way.setTag("highway", "track");
         way.setTag("tracktype", "grade1");
         assertPriorityAndSpeed(UNCHANGED, 18, way);