Only allow mtb:scale 0 or 1 and lower for trecking & racebikes, and s…

…upport "+" and "-" values
ratrun · Sep 14, 2024 · 4b6a117 · 4b6a117
1 parent 2b75aa7
commit 4b6a117
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAccessParser.java b/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAccessParser.java
@@ -113,7 +113,9 @@ boolean isSacScaleAllowed(String sacScale) {
 
     boolean isMtbScaleAllowed(String mtbScale) {
         // keep even more difficult accessible as one may push, see https://wiki.openstreetmap.org/wiki/Key:mtb:scale
-        return "0".equals(mtbScale) || "1".equals(mtbScale) || "2".equals(mtbScale);
+        if (mtbScale.length() == 2 && (mtbScale.charAt(1) == '+' || mtbScale.charAt(1) == '-'))
+            mtbScale = mtbScale.substring(0, 1);
+        return "0".equals(mtbScale) || "1".equals(mtbScale);
     }
 
     @Override

diff --git a/core/src/main/java/com/graphhopper/routing/util/parsers/MountainBikeAccessParser.java b/core/src/main/java/com/graphhopper/routing/util/parsers/MountainBikeAccessParser.java
@@ -28,6 +28,8 @@ boolean isSacScaleAllowed(String sacScale) {
 
     @Override
     boolean isMtbScaleAllowed(String mtbScale) {
+        if (mtbScale.length() == 2 && (mtbScale.charAt(1) == '+' || mtbScale.charAt(1) == '-'))
+            mtbScale = mtbScale.substring(0, 1);
         return !"6".equals(mtbScale);
     }
 

diff --git a/core/src/test/java/com/graphhopper/routing/util/parsers/AbstractBikeTagParserTester.java b/core/src/test/java/com/graphhopper/routing/util/parsers/AbstractBikeTagParserTester.java
@@ -384,7 +384,11 @@ public void testMtbScaleAccess() {
         way.setTag("highway", "path");
         way.setTag("mtb:scale", "0");
         assertTrue(accessParser.getAccess(way).isWay());
-        way.setTag("mtb:scale", "3");
+        way.setTag("mtb:scale", "1+");
+        assertTrue(accessParser.getAccess(way).isWay());
+        way.setTag("mtb:scale", "1-");
+        assertTrue(accessParser.getAccess(way).isWay());
+        way.setTag("mtb:scale", "2");
         assertTrue(accessParser.getAccess(way).canSkip());
     }