Incorporate further changes from review

ratrun · Jun 12, 2024 · 2e3902e · 2e3902e
1 parent efe21ad
commit 2e3902e
Showing 1 changed file with 4 additions and 15 deletions.
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
@@ -8,10 +8,7 @@
 import com.graphhopper.routing.util.FerrySpeedCalculator;
 import com.graphhopper.util.Helper;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public abstract class BikeCommonAverageSpeedParser extends AbstractAverageSpeedParser implements TagParser {
 
@@ -25,7 +22,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);
+    private final Set<String> restrictedValues = new HashSet<>(List.of("no", "agricultural", "forestry", "restricted", "military", "emergency", "private", "permit"));
 
     protected BikeCommonAverageSpeedParser(DecimalEncodedValue speedEnc, EnumEncodedValue<Smoothness> smoothnessEnc, DecimalEncodedValue ferrySpeedEnc) {
         super(speedEnc, ferrySpeedEnc);
@@ -118,14 +115,6 @@ protected BikeCommonAverageSpeedParser(DecimalEncodedValue speedEnc, EnumEncoded
         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");
     }
 
     /**
@@ -198,8 +187,8 @@ else if (way.hasTag("highway", pushingSectionsHighways)
             }
         }
 
-boolean pushingRestriction = Arrays.stream(way.getTag("vehicle", "").split(";")).anyMatch(restrictedValues::contains);
-if (pushingRestriction && !way.hasTag("bicycle", intendedValues))
+        boolean pushingRestriction = Arrays.stream(way.getTag("vehicle", "").split(";")).anyMatch(restrictedValues::contains);
+        if (pushingRestriction && !way.hasTag("bicycle", intendedValues))
             speed = PUSHING_SECTION_SPEED;
 
         // Until now we assumed that the way is no pushing section