Keep priorities for bikenetwork in MountainBikePriorityParser

ratrun · Nov 7, 2023 · abb31a2 · abb31a2
1 parent d32c7bb
commit abb31a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/util/parsers/MountainBikePriorityParser.java b/core/src/main/java/com/graphhopper/routing/util/parsers/MountainBikePriorityParser.java
@@ -22,9 +22,9 @@ protected MountainBikePriorityParser(DecimalEncodedValue speedEnc, DecimalEncode
                                          EnumEncodedValue<RouteNetwork> bikeRouteEnc) {
         super(priorityEnc, speedEnc, bikeRouteEnc);
 
-        routeMap.put(INTERNATIONAL, BEST.getValue());
-        routeMap.put(NATIONAL, BEST.getValue());
-        routeMap.put(REGIONAL, BEST.getValue());
+        routeMap.put(INTERNATIONAL, PREFER.getValue());
+        routeMap.put(NATIONAL, PREFER.getValue());
+        routeMap.put(REGIONAL, PREFER.getValue());
         routeMap.put(LOCAL, BEST.getValue());
 
         preferHighwayTags.add("road");

diff --git a/core/src/test/java/com/graphhopper/routing/util/parsers/MountainBikeTagParserTest.java b/core/src/test/java/com/graphhopper/routing/util/parsers/MountainBikeTagParserTest.java
@@ -145,7 +145,7 @@ public void testHandleWayTagsInfluencedByBikeAndMtbRelation() {
         // relation code is PREFER
         osmRel.setTag("route", "bicycle");
         osmRel.setTag("network", "lcn");
-        assertPriorityAndSpeed(PREFER, 18, osmWay, osmRel);
+        assertPriorityAndSpeed(BEST, 18, osmWay, osmRel);
 
         // relation code is PREFER
         osmRel.setTag("network", "rcn");
@@ -162,7 +162,7 @@ public void testHandleWayTagsInfluencedByBikeAndMtbRelation() {
 
         osmRel.setTag("route", "bicycle");
         osmRel.setTag("network", "lcn");
-        assertPriorityAndSpeed(PREFER, 18, osmWay, osmRel);
+        assertPriorityAndSpeed(BEST, 18, osmWay, osmRel);
 
         osmWay.clearTags();
         osmRel.clearTags();
@@ -172,20 +172,20 @@ public void testHandleWayTagsInfluencedByBikeAndMtbRelation() {
 
         osmRel.setTag("route", "mtb");
         osmRel.setTag("network", "lcn");
-        assertPriorityAndSpeed(BEST, 18, osmWay, osmRel);
+        assertPriorityAndSpeed(PREFER, 18, osmWay, osmRel);
 
         osmRel.setTag("network", "rcn");
-        assertPriorityAndSpeed(BEST, 18, osmWay, osmRel);
+        assertPriorityAndSpeed(PREFER, 18, osmWay, osmRel);
 
         osmRel.setTag("network", "ncn");
-        assertPriorityAndSpeed(BEST, 18, osmWay, osmRel);
+        assertPriorityAndSpeed(PREFER, 18, osmWay, osmRel);
 
         osmWay.clearTags();
         osmWay.setTag("highway", "tertiary");
 
         osmRel.setTag("route", "mtb");
         osmRel.setTag("network", "lcn");
-        assertPriorityAndSpeed(BEST, 18, osmWay, osmRel);
+        assertPriorityAndSpeed(PREFER, 18, osmWay, osmRel);
     }
 
     // Issue 407 : Always block kissing_gate except for mountainbikes