Revert "Revert "Merge branch 'car-ferry-changes' into dev-2.x""

This reverts commit d14e6af.
HSLdevcom · Oct 23, 2024 · 7742400 · 7742400
1 parent d14e6af
commit 7742400
Show file tree

Hide file tree

Showing 33 changed files with 1,371 additions and 318 deletions.
diff --git a/application/src/client/index.html b/application/src/client/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>OTP Debug Client</title>
-    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/10/2024-10-16T19:58/assets/index-4w7I5Ind.js"></script>
-    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/10/2024-10-16T19:58/assets/index-BcsxnGE8.css">
+    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/10/2024-10-17T07:45/assets/index-CZI6LO02.js"></script>
+    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/10/2024-10-17T07:45/assets/index-BqgnKsMX.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
@@ -1492,6 +1492,7 @@ public enum GraphQLPlanAccessMode {
     BICYCLE,
     BICYCLE_PARKING,
     BICYCLE_RENTAL,
+    CAR,
     CAR_DROP_OFF,
     CAR_PARKING,
     CAR_RENTAL,
@@ -1575,6 +1576,7 @@ public enum GraphQLPlanDirectMode {
   public enum GraphQLPlanEgressMode {
     BICYCLE,
     BICYCLE_RENTAL,
+    CAR,
     CAR_PICKUP,
     CAR_RENTAL,
     FLEX,
@@ -1877,6 +1879,7 @@ public void setGraphQLWalk(GraphQLWalkPreferencesInput walk) {
 
   public enum GraphQLPlanTransferMode {
     BICYCLE,
+    CAR,
     WALK,
   }
 

diff --git a/...on/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AccessModeMapper.java b/...on/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AccessModeMapper.java
@@ -13,6 +13,7 @@ public static StreetMode map(GraphQLTypes.GraphQLPlanAccessMode mode) {
       case BICYCLE -> StreetMode.BIKE;
       case BICYCLE_RENTAL -> StreetMode.BIKE_RENTAL;
       case BICYCLE_PARKING -> StreetMode.BIKE_TO_PARK;
+      case CAR -> StreetMode.CAR;
       case CAR_RENTAL -> StreetMode.CAR_RENTAL;
       case CAR_PARKING -> StreetMode.CAR_TO_PARK;
       case CAR_DROP_OFF -> StreetMode.CAR_PICKUP;

diff --git a/...on/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/EgressModeMapper.java b/...on/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/EgressModeMapper.java
@@ -12,6 +12,7 @@ public static StreetMode map(GraphQLTypes.GraphQLPlanEgressMode mode) {
     return switch (mode) {
       case BICYCLE -> StreetMode.BIKE;
       case BICYCLE_RENTAL -> StreetMode.BIKE_RENTAL;
+      case CAR -> StreetMode.CAR;
       case CAR_RENTAL -> StreetMode.CAR_RENTAL;
       case CAR_PICKUP -> StreetMode.CAR_PICKUP;
       case FLEX -> StreetMode.FLEXIBLE;

diff --git a/...c/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java b/...c/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java
@@ -168,5 +168,10 @@ private static void validateStreetModes(JourneyRequest journey) {
         "If BICYCLE is used for access, egress or transfer, then it should be used for all."
       );
     }
+    if (modes.contains(StreetMode.CAR) && modes.size() != 1) {
+      throw new IllegalArgumentException(
+        "If CAR is used for access, egress or transfer, then it should be used for all."
+      );
+    }
   }
 }
diff --git a/.../src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransferModeMapper.java b/.../src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransferModeMapper.java
@@ -10,6 +10,7 @@ public class TransferModeMapper {
 
   public static StreetMode map(GraphQLTypes.GraphQLPlanTransferMode mode) {
     return switch (mode) {
+      case CAR -> StreetMode.CAR;
       case BICYCLE -> StreetMode.BIKE;
       case WALK -> StreetMode.WALK;
     };

diff --git a/...ication/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java b/...ication/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java
@@ -10,7 +10,8 @@
 
 class RequestModesMapper {
 
-  private static final Predicate<StreetMode> IS_BIKE = m -> m == StreetMode.BIKE;
+  private static final Predicate<StreetMode> IS_BIKE_OR_CAR = m ->
+    m == StreetMode.BIKE || m == StreetMode.CAR;
   private static final String accessModeKey = "accessMode";
   private static final String egressModeKey = "egressMode";
   private static final String directModeKey = "directMode";
@@ -27,7 +28,10 @@ static RequestModes mapRequestModes(Map<String, ?> modesInput) {
     ensureValueAndSet(accessMode, mBuilder::withAccessMode);
     ensureValueAndSet((StreetMode) modesInput.get(egressModeKey), mBuilder::withEgressMode);
     ensureValueAndSet((StreetMode) modesInput.get(directModeKey), mBuilder::withDirectMode);
-    Optional.ofNullable(accessMode).filter(IS_BIKE).ifPresent(mBuilder::withTransferMode);
+    // The only cases in which the transferMode isn't WALK are when the accessMode is either BIKE or CAR.
+    // In these cases, the transferMode is the same as the accessMode. This check is not strictly necessary
+    // if there is a need for more freedom for specifying the transferMode.
+    Optional.ofNullable(accessMode).filter(IS_BIKE_OR_CAR).ifPresent(mBuilder::withTransferMode);
 
     return mBuilder.build();
   }