Allow sac_scale=hiking for race bike, see discussion in graphhopper#2357

. (graphhopper#2358)
bt90 · Jul 7, 2021 · 5076392 · 5076392
1 parent e692138
commit 5076392
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/util/BikeCommonFlagEncoder.java b/core/src/main/java/com/graphhopper/routing/util/BikeCommonFlagEncoder.java
@@ -234,9 +234,6 @@ public EncodingManager.Access getAccess(ReaderWay way) {
 
         String sacScale = way.getTag("sac_scale");
         if (sacScale != null) {
-            if ((way.hasTag("highway", "cycleway"))
-                    && (way.hasTag("sac_scale", "hiking")))
-                return EncodingManager.Access.WAY;
             if (!isSacScaleAllowed(sacScale))
                 return EncodingManager.Access.CAN_SKIP;
         }

diff --git a/core/src/main/java/com/graphhopper/routing/util/RacingBikeFlagEncoder.java b/core/src/main/java/com/graphhopper/routing/util/RacingBikeFlagEncoder.java
@@ -150,12 +150,6 @@ else if (trackType == null || trackType.startsWith("grade"))
         }
     }
 
-    @Override
-    boolean isSacScaleAllowed(String sacScale) {
-        // for racing bike it is only allowed if empty
-        return false;
-    }
-
     @Override
     public String toString() {
         return "racingbike";

diff --git a/core/src/test/java/com/graphhopper/routing/util/RacingBikeFlagEncoderTest.java b/core/src/test/java/com/graphhopper/routing/util/RacingBikeFlagEncoderTest.java
@@ -78,11 +78,6 @@ public void testSacScale() {
 
         way.setTag("highway", "path");
         way.setTag("sac_scale", "hiking");
-        assertTrue(encoder.getAccess(way).canSkip());
-
-        way.setTag("highway", "cycleway");
-        way.setTag("sac_scale", "hiking");
-        // but allow this as there is no reason for not allowing it
         assertTrue(encoder.getAccess(way).isWay());
 
         // This looks to be tagging error: