Assume Toll.HGV for all roads in CH/LI (graphhopper#3043)

* Assume Toll.HGV for all roads in Switzerland * Assume Toll.HGV for all roads in Liechtenstein
ratrun · Aug 22, 2024 · 2182ff8 · 2182ff8
1 parent f474257
commit 2182ff8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.../main/java/com/graphhopper/routing/util/countryrules/europe/LiechtensteinCountryRule.java b/.../main/java/com/graphhopper/routing/util/countryrules/europe/LiechtensteinCountryRule.java
@@ -30,6 +30,6 @@ public Toll getToll(ReaderWay readerWay, Toll currentToll) {
             return currentToll;
         }
 
-        return Toll.NO;
+        return Toll.HGV;
     }
 }
diff --git a/...rc/main/java/com/graphhopper/routing/util/countryrules/europe/SwitzerlandCountryRule.java b/...rc/main/java/com/graphhopper/routing/util/countryrules/europe/SwitzerlandCountryRule.java
@@ -36,12 +36,9 @@ public Toll getToll(ReaderWay readerWay, Toll currentToll) {
         }
 
         RoadClass roadClass = RoadClass.find(readerWay.getTag("highway", ""));
-        switch (roadClass) {
-            case MOTORWAY:
-            case TRUNK:
-                return Toll.ALL;
-            default:
-                return currentToll;
-        }
+        return switch (roadClass) {
+            case MOTORWAY, TRUNK -> Toll.ALL;
+            default -> Toll.HGV;
+        };
     }
 }