introduce bridge, ferry, motorway, tunnel restriction for GraphHopper

remove fragments of Google Directions
cpesch · Jan 25, 2024 · 91592f5 · 91592f5
1 parent cbc2704
commit 91592f5
Show file tree

Hide file tree

Showing 44 changed files with 294 additions and 2,426 deletions.
diff --git a/brouter/src/main/java/slash/navigation/brouter/BRouter.java b/brouter/src/main/java/slash/navigation/brouter/BRouter.java
@@ -51,6 +51,7 @@
 import static slash.navigation.download.Checksum.createChecksum;
 import static slash.navigation.routing.RoutingResult.Validity.Invalid;
 import static slash.navigation.routing.RoutingResult.Validity.Valid;
+import static slash.navigation.routing.TravelRestrictions.NO_RESTRICTIONS;
 
 /**
  * Encapsulates access to the BRouter.
@@ -107,22 +108,6 @@ public boolean isDownload() {
         return true;
     }
 
-    public boolean isSupportTurnpoints() {
-        return false;
-    }
-
-    public boolean isSupportAvoidFerries() {
-        return false;
-    }
-
-    public boolean isSupportAvoidHighways() {
-        return false;
-    }
-
-    public boolean isSupportAvoidTolls() {
-        return false;
-    }
-
     public List<TravelMode> getAvailableTravelModes() {
         List<TravelMode> result = new ArrayList<>();
         if (getProfiles() != null) {
@@ -140,6 +125,10 @@ public TravelMode getPreferredTravelMode() {
         return MOPED;
     }
 
+    public TravelRestrictions getAvailableTravelRestrictions() {
+        return NO_RESTRICTIONS;
+    }
+
     public String getPath() {
         return preferences.get(DIRECTORY_PREFERENCE, "");
     }
@@ -209,7 +198,7 @@ Set<String> createFileKeys(double longitude, double latitude) {
         return result;
     }
 
-    public RoutingResult getRouteBetween(NavigationPosition from, NavigationPosition to, TravelMode travelMode) {
+    public RoutingResult getRouteBetween(NavigationPosition from, NavigationPosition to, TravelMode travelMode, TravelRestrictions travelRestrictions) {
         SecondCounter secondCounter = new SecondCounter() {
             protected void second(int second) {
                 fireRouting(second);

diff --git a/brouter/src/test/java/slash/navigation/brouter/BRouterIT.java b/brouter/src/test/java/slash/navigation/brouter/BRouterIT.java
@@ -43,6 +43,7 @@
 import static slash.common.io.Directories.getApplicationDirectory;
 import static slash.common.io.Externalization.extractFile;
 import static slash.navigation.routing.RoutingResult.Validity.Valid;
+import static slash.navigation.routing.TravelRestrictions.NO_RESTRICTIONS;
 
 public class BRouterIT {
     private static final NavigationPosition FROM = new SimpleNavigationPosition(10.18587, 53.40451);
@@ -101,7 +102,7 @@ private TravelMode getTravelMode(String lookupName) {
 
     @Test
     public void testGetRouteBetweenByCar() {
-        RoutingResult result = router.getRouteBetween(FROM, TO, getTravelMode("car-eco"));
+        RoutingResult result = router.getRouteBetween(FROM, TO, getTravelMode("car-eco"), NO_RESTRICTIONS);
         assertEquals(Valid, result.getValidity());
         assertEquals(324, result.getPositions().size(), 10);
         assertEquals(13789, result.getDistanceAndTime().getDistance(), 25.0);
@@ -110,7 +111,7 @@ public void testGetRouteBetweenByCar() {
 
     @Test
     public void testGetRouteBetweenByBike() {
-        RoutingResult result = router.getRouteBetween(FROM, TO, getTravelMode("trekking"));
+        RoutingResult result = router.getRouteBetween(FROM, TO, getTravelMode("trekking"), NO_RESTRICTIONS);
         assertEquals(Valid, result.getValidity());
         assertEquals(185, result.getPositions().size(), 8);
         assertEquals(13899.0, result.getDistanceAndTime().getDistance(), 25.0);