Add boardCost functionality for cars.

Author: VillePihlava

application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java

@@ -27,6 +27,10 @@ static void setCarPreferences(
     if (reluctance != null) {
       preferences.withReluctance(reluctance);
     }
+    var boardCost = args.getGraphQLBoardCost();
+    if (boardCost != null) {
+      preferences.withBoardCost(boardCost.toSeconds());
+    }
     preferences.withParking(parking ->
       setCarParkingPreferences(parking, args.getGraphQLParking(), environment)
     );

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java

@@ -25,8 +25,11 @@ public static GeneralizedCostParameters map(
       .transferCost(preferences.transfer().cost())
       .waitReluctanceFactor(preferences.transfer().waitReluctance());
 
-    if (request.journey().transfer().mode() == StreetMode.BIKE) {
+    StreetMode mode = request.journey().transfer().mode();
+    if (mode == StreetMode.BIKE) {
       builder.boardCost(preferences.bike().boardCost());
+    } else if (mode == StreetMode.CAR) {
+      builder.boardCost(preferences.car().boardCost());
     } else {
       builder.boardCost(preferences.walk().boardCost());
     }

application/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java

@@ -23,6 +23,7 @@ public final class CarPreferences implements Serializable {
   public static final CarPreferences DEFAULT = new CarPreferences();
 
   private final double reluctance;
+  private final Cost boardCost;
   private final VehicleParkingPreferences parking;
   private final VehicleRentalPreferences rental;
   private final Duration pickupTime;
@@ -33,6 +34,7 @@ public final class CarPreferences implements Serializable {
   /** Create a new instance with default values. */
   private CarPreferences() {
     this.reluctance = 2.0;
+    this.boardCost = Cost.costOfMinutes(10);
     this.parking = VehicleParkingPreferences.DEFAULT;
     this.rental = VehicleRentalPreferences.DEFAULT;
     this.pickupTime = Duration.ofMinutes(1);
@@ -43,6 +45,7 @@ private CarPreferences() {
 
   private CarPreferences(Builder builder) {
     this.reluctance = Units.reluctance(builder.reluctance);
+    this.boardCost = builder.boardCost;
     this.parking = builder.parking;
     this.rental = builder.rental;
     this.pickupTime = Duration.ofSeconds(Units.duration(builder.pickupTime));
@@ -63,6 +66,15 @@ public double reluctance() {
     return reluctance;
   }
 
+  /**
+   * Separate cost for boarding a vehicle with a car, which is different compared to on foot or with a bicycle. This
+   * is in addition to the cost of the transfer and waiting-time. It is also in addition to
+   * the {@link TransferPreferences#cost()}.
+   */
+  public int boardCost() {
+    return boardCost.toSeconds();
+  }
+
   /** Parking preferences that can be different per request */
   public VehicleParkingPreferences parking() {
     return parking;
@@ -106,6 +118,7 @@ public boolean equals(Object o) {
     CarPreferences that = (CarPreferences) o;
     return (
       DoubleUtils.doubleEquals(that.reluctance, reluctance) &&
+      boardCost.equals(that.boardCost) &&
       parking.equals(that.parking) &&
       rental.equals(that.rental) &&
       Objects.equals(pickupTime, that.pickupTime) &&
@@ -119,6 +132,7 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(
       reluctance,
+      boardCost,
       parking,
       rental,
       pickupTime,
@@ -133,6 +147,7 @@ public String toString() {
     return ToStringBuilder
       .of(CarPreferences.class)
       .addNum("reluctance", reluctance, DEFAULT.reluctance)
+      .addObj("boardCost", boardCost, DEFAULT.boardCost)
       .addObj("parking", parking, DEFAULT.parking)
       .addObj("rental", rental, DEFAULT.rental)
       .addObj("pickupTime", pickupTime, DEFAULT.pickupTime)
@@ -147,6 +162,7 @@ public static class Builder {
 
     private final CarPreferences original;
     private double reluctance;
+    private Cost boardCost;
     private VehicleParkingPreferences parking;
     private VehicleRentalPreferences rental;
     private int pickupTime;
@@ -157,6 +173,7 @@ public static class Builder {
     public Builder(CarPreferences original) {
       this.original = original;
       this.reluctance = original.reluctance;
+      this.boardCost = original.boardCost;
       this.parking = original.parking;
       this.rental = original.rental;
       this.pickupTime = (int) original.pickupTime.toSeconds();
@@ -174,6 +191,15 @@ public Builder withReluctance(double reluctance) {
       return this;
     }
 
+    public Cost boardCost() {
+      return boardCost;
+    }
+
+    public Builder withBoardCost(int boardCost) {
+      this.boardCost = Cost.costOfSeconds(boardCost);
+      return this;
+    }
+
     public Builder withParking(Consumer<VehicleParkingPreferences.Builder> body) {
       this.parking = ifNotNull(this.parking, original.parking).copyOf().apply(body).build();
       return this;