use car_access as count indication for all profiles (graphhopper#3079)

Author: karussell

core/src/main/java/com/graphhopper/GraphHopper.java

@@ -859,6 +859,7 @@ protected void prepareImport() {
         encodedValuesWithProps.putIfAbsent(RoadEnvironment.KEY, new PMap());
         // used by instructions...
         encodedValuesWithProps.putIfAbsent(Roundabout.KEY, new PMap());
+        encodedValuesWithProps.putIfAbsent(VehicleAccess.key("car"), new PMap());
         encodedValuesWithProps.putIfAbsent(RoadClassLink.KEY, new PMap());
         encodedValuesWithProps.putIfAbsent(MaxSpeed.KEY, new PMap());
 

core/src/main/java/com/graphhopper/routing/InstructionsFromEdges.java

@@ -95,7 +95,9 @@ public InstructionsFromEdges(Graph graph, Weighting weighting, EncodedValueLooku
         prevNode = -1;
         prevInRoundabout = false;
         prevName = null;
-        outEdgeExplorer = graph.createEdgeExplorer(edge -> Double.isFinite(weighting.calcEdgeWeight(edge, false)));
+
+        BooleanEncodedValue carAccessEnc = evLookup.getBooleanEncodedValue(VehicleAccess.key("car"));
+        outEdgeExplorer = graph.createEdgeExplorer(edge -> edge.get(carAccessEnc));
         allExplorer = graph.createEdgeExplorer();
     }
 

core/src/test/java/com/graphhopper/reader/osm/GraphHopperOSMTest.java

@@ -468,7 +468,7 @@ public void testNothingHappensWhenProfilesAreChangedForLoad() {
                 setGraphHopperLocation(ghLoc);
         instance.load();
         assertEquals(5, instance.getBaseGraph().getNodes());
-        assertEquals("road_class,road_environment,roundabout,road_class_link,max_speed,foot_subnetwork,car_subnetwork",
+        assertEquals("road_class,road_environment,roundabout,car_access,road_class_link,max_speed,foot_subnetwork,car_subnetwork",
                 instance.getEncodingManager().getEncodedValues().stream().map(EncodedValue::getName).collect(Collectors.joining(",")));
     }
 
@@ -500,7 +500,7 @@ public void testFailsForWrongEVConfig() {
                 setOSMFile(testOsm3);
         instance.load();
         assertEquals(5, instance.getBaseGraph().getNodes());
-        assertEquals("road_class,road_environment,roundabout,road_class_link,max_speed,car_subnetwork", instance.getEncodingManager().getEncodedValues().stream().map(EncodedValue::getName).collect(Collectors.joining(",")));
+        assertEquals("road_class,road_environment,roundabout,car_access,road_class_link,max_speed,car_subnetwork", instance.getEncodingManager().getEncodedValues().stream().map(EncodedValue::getName).collect(Collectors.joining(",")));
     }
 
     @Test

core/src/test/java/com/graphhopper/routing/PathTest.java

@@ -55,8 +55,8 @@ public class InstructionListTest {
     @BeforeEach
     public void setUp() {
         speedEnc = new DecimalEncodedValueImpl("speed", 5, 5, true);
-        carManager = EncodingManager.start().add(speedEnc).add(Roundabout.create())
-                .add(MaxSpeed.create()).add(RoadClass.create()).add(RoadClassLink.create()).build();
+        carManager = EncodingManager.start().add(speedEnc).add(Roundabout.create()).add(VehicleAccess.create("car")).
+                add(MaxSpeed.create()).add(RoadClass.create()).add(RoadClassLink.create()).build();
     }
 
     private static List<String> getTurnDescriptions(InstructionList instructionList) {
@@ -299,8 +299,9 @@ public void testNoInstructionIfSlightTurnAndAlternativeIsSharp2() {
     @Test
     public void testNoInstructionIfSlightTurnAndAlternativeIsSharp3() {
         DecimalEncodedValue speedEnc = new DecimalEncodedValueImpl("speed", 4, 2, true);
-        EncodingManager tmpEM = new EncodingManager.Builder().add(speedEnc).add(RoadClass.create())
-                .add(RoadClassLink.create()).add(Roundabout.create()).add(MaxSpeed.create()).build();
+        EncodingManager tmpEM = new EncodingManager.Builder().add(speedEnc).add(RoadClass.create()).
+                add(VehicleAccess.create("car")).add(RoadClassLink.create()).add(Roundabout.create()).
+                add(MaxSpeed.create()).build();
         EnumEncodedValue<RoadClass> rcEV = tmpEM.getEnumEncodedValue(RoadClass.KEY, RoadClass.class);
         BaseGraph g = new BaseGraph.Builder(tmpEM).create();
         // real world example: https://graphhopper.com/maps/?point=48.411549,15.599567&point=48.411663%2C15.600527&profile=bike
@@ -338,7 +339,9 @@ public void testNoInstructionIfSlightTurnAndAlternativeIsSharp3() {
     @Test
     public void testInstructionIfTurn() {
         DecimalEncodedValue speedEnc = new DecimalEncodedValueImpl("speed", 4, 2, true);
-        EncodingManager tmpEM = new EncodingManager.Builder().add(speedEnc).add(RoadClass.create()).add(RoadClassLink.create()).add(Roundabout.create()).add(MaxSpeed.create()).build();
+        EncodingManager tmpEM = new EncodingManager.Builder().add(speedEnc).add(RoadClass.create()).
+                add(VehicleAccess.create("car")).add(RoadClassLink.create()).add(Roundabout.create()).
+                add(MaxSpeed.create()).build();
         EnumEncodedValue<RoadClass> rcEV = tmpEM.getEnumEncodedValue(RoadClass.KEY, RoadClass.class);
         BaseGraph g = new BaseGraph.Builder(tmpEM).create();
         // real world example: https://graphhopper.com/maps/?point=48.412169%2C15.604888&point=48.412251%2C15.60543&profile=bike
@@ -375,8 +378,9 @@ public void testInstructionIfTurn() {
     @Test
     public void testInstructionIfSlightTurn() {
         DecimalEncodedValue speedEnc = new DecimalEncodedValueImpl("speed", 4, 1, false);
-        EncodingManager tmpEM = new EncodingManager.Builder().add(speedEnc)
-                .add(Roundabout.create()).add(RoadClass.create()).add(RoadClassLink.create()).add(MaxSpeed.create()).build();
+        EncodingManager tmpEM = new EncodingManager.Builder().add(speedEnc).add(Roundabout.create()).
+                add(VehicleAccess.create("car")).add(RoadClass.create()).add(RoadClassLink.create()).
+                add(MaxSpeed.create()).build();
         BaseGraph g = new BaseGraph.Builder(tmpEM).create();
         // real world example: https://graphhopper.com/maps/?point=43.729379,7.417697&point=43.729798,7.417263&profile=foot
         // From 4 to 3 and 4 to 1
@@ -428,8 +432,9 @@ public void testInstructionIfSlightTurn() {
     public void testInstructionWithHighlyCustomProfileWithRoadsBase() {
         BooleanEncodedValue roadsAccessEnc = new SimpleBooleanEncodedValue("access", true);
         DecimalEncodedValue roadsSpeedEnc = new DecimalEncodedValueImpl("speed", 7, 2, true);
-        EncodingManager tmpEM = EncodingManager.start().add(roadsAccessEnc).add(roadsSpeedEnc)
-                .add(RoadClass.create()).add(Roundabout.create()).add(RoadClassLink.create()).add(MaxSpeed.create()).build();
+        EncodingManager tmpEM = EncodingManager.start().add(roadsAccessEnc).add(roadsSpeedEnc).
+                add(RoadClass.create()).add(Roundabout.create()).add(RoadClassLink.create()).
+                add(MaxSpeed.create()).add(VehicleAccess.create("car")).build();
         EnumEncodedValue<RoadClass> rcEV = tmpEM.getEnumEncodedValue(RoadClass.KEY, RoadClass.class);
         BaseGraph g = new BaseGraph.Builder(tmpEM).create();
         // real world example: https://graphhopper.com/maps/?point=55.691214%2C12.57065&point=55.689957%2C12.570387
@@ -523,7 +528,7 @@ public void testSplitWays() {
         DecimalEncodedValue roadsSpeedEnc = new DecimalEncodedValueImpl("speed", 7, 2, true);
         EncodingManager tmpEM = EncodingManager.start().add(roadsSpeedEnc).
                 add(RoadClass.create()).add(Roundabout.create()).add(RoadClassLink.create()).
-                add(MaxSpeed.create()).add(Lanes.create()).build();
+                add(MaxSpeed.create()).add(Lanes.create()).add(VehicleAccess.create("car")).build();
         IntEncodedValue lanesEnc = tmpEM.getIntEncodedValue(Lanes.KEY);
         BaseGraph g = new BaseGraph.Builder(tmpEM).create();
         // real world example: https://graphhopper.com/maps/?point=43.626238%2C-79.715268&point=43.624647%2C-79.713204&profile=car
@@ -568,7 +573,7 @@ public void testSplitWays() {
     @Test
     public void testNotSplitWays() {
         DecimalEncodedValue roadsSpeedEnc = new DecimalEncodedValueImpl("speed", 7, 2, true);
-        EncodingManager tmpEM = EncodingManager.start().add(roadsSpeedEnc).
+        EncodingManager tmpEM = EncodingManager.start().add(roadsSpeedEnc).add(VehicleAccess.create("car")).
                 add(RoadClass.create()).add(Roundabout.create()).add(RoadClassLink.create()).
                 add(MaxSpeed.create()).add(Lanes.create()).build();
         IntEncodedValue lanesEnc = tmpEM.getIntEncodedValue(Lanes.KEY);

core/src/test/java/com/graphhopper/util/InstructionListTest.java

@@ -53,8 +53,9 @@ public class PathSimplificationTest {
     @Test
     public void testScenario() {
         DecimalEncodedValue speedEnc = new DecimalEncodedValueImpl("speed", 5, 5, false);
-        EncodingManager carManager = EncodingManager.start().add(speedEnc)
-                .add(Roundabout.create()).add(RoadClass.create()).add(RoadClassLink.create()).add(MaxSpeed.create()).build();
+        EncodingManager carManager = EncodingManager.start().add(speedEnc).
+                add(VehicleAccess.create("car")).add(Roundabout.create()).add(RoadClass.create()).
+                add(RoadClassLink.create()).add(MaxSpeed.create()).build();
         BaseGraph g = new BaseGraph.Builder(carManager).create();
         // 0-1-2
         // | | |

core/src/test/java/com/graphhopper/util/PathSimplificationTest.java

@@ -58,7 +58,8 @@ public class GpxConversionsTest {
     @BeforeEach
     public void setUp() {
         speedEnc = new DecimalEncodedValueImpl("speed", 5, 5, false);
-        carManager = EncodingManager.start().add(speedEnc).add(Roundabout.create()).add(RoadClass.create()).add(RoadClassLink.create()).add(MaxSpeed.create()).build();
+        carManager = EncodingManager.start().add(speedEnc).add(VehicleAccess.create("car")).
+                add(Roundabout.create()).add(RoadClass.create()).add(RoadClassLink.create()).add(MaxSpeed.create()).build();
         trMap = new TranslationMap().doImport();
     }