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 index 15058cbcece..bd727a9d0b8 100644 --- 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 highwaySpeeds = new HashMap<>(); private final EnumEncodedValue smoothnessEnc; protected final Set intendedValues = new HashSet<>(5); - protected final Set restrictedValues = new HashSet<>(8); + private final Set restrictedValues = new HashSet<>(List.of("no", "agricultural", "forestry", "restricted", "military", "emergency", "private", "permit")); protected BikeCommonAverageSpeedParser(DecimalEncodedValue speedEnc, EnumEncodedValue 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