Also set slack in APIs

Author: leonardehrenfried

docs/examples/entur/router-config.json

@@ -52,7 +52,7 @@
     },
     "waitReluctance": 1.0,
     "otherThanPreferredRoutesPenalty": 300,
-    "transferSlack": 120,
+    "transferSlack": "2m",
     // Default slack for any mode is 0 (zero)
     "boardSlackForMode": {
       "AIRPLANE" : "2100s"

docs/examples/ibi/portland/router-config.json

@@ -3,7 +3,7 @@
     "maxJourneyDuration": "6h",
     "boardSlack": "0s",
     "alightSlack": "0s",
-    "transferSlack": 180,
+    "transferSlack": "3m",
     "waitReluctance": 0.9,
     "walk": {
       "reluctance": 1.75,

docs/examples/skanetrafiken/router-config.json

@@ -3,7 +3,7 @@
     "itineraryFilters": {
       "filterItinerariesWithSameFirstOrLastTrip": true
     },
-    "transferSlack": 180,
+    "transferSlack": "3m",
     "waitReluctance": 0.175,
     "walk": {
       "reluctance": 5

src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java

@@ -26,7 +26,7 @@ static void mapPreferences(
     preferences.withBike(bike -> mapBikePreferences(bike, callWith));
     preferences.withCar(car -> mapCarPreferences(car, callWith));
     preferences.withScooter(scooter -> mapScooterPreferences(scooter, callWith));
-    preferences.withTransfer(transfer -> mapTransferPreferences(transfer, environment, callWith));
+    preferences.withTransfer(transfer -> mapTransferPreferences(transfer, callWith));
     preferences.withTransit(transit -> mapTransitPreferences(transit, environment, callWith));
     preferences.withItineraryFilter(itineraryFilter ->
       mapItineraryFilterPreferences(itineraryFilter, environment, callWith)

src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java

@@ -1,24 +1,28 @@
 package org.opentripplanner.apis.transmodel.mapping.preferences;
 
-import graphql.schema.DataFetchingEnvironment;
+import java.time.Duration;
+import java.util.function.Consumer;
 import org.opentripplanner.apis.transmodel.support.DataFetcherDecorator;
 import org.opentripplanner.routing.api.request.preference.TransferPreferences;
 
 public class TransferPreferencesMapper {
 
   public static void mapTransferPreferences(
     TransferPreferences.Builder transfer,
-    DataFetchingEnvironment environment,
     DataFetcherDecorator callWith
   ) {
     callWith.argument("transferPenalty", transfer::withCost);
 
     // 'minimumTransferTime' is deprecated, that's why we are mapping 'slack' twice.
-    callWith.argument("minimumTransferTime", transfer::withSlack);
-    callWith.argument("transferSlack", transfer::withSlack);
+    callWith.argument("minimumTransferTime", setSlackFromSeconds(transfer));
+    callWith.argument("transferSlack", setSlackFromSeconds(transfer));
 
     callWith.argument("waitReluctance", transfer::withWaitReluctance);
     callWith.argument("maximumTransfers", transfer::withMaxTransfers);
     callWith.argument("maximumAdditionalTransfers", transfer::withMaxAdditionalTransfers);
   }
+
+  private static Consumer<Integer> setSlackFromSeconds(TransferPreferences.Builder transfer) {
+    return (Integer secs) -> transfer.withSlack(Duration.ofSeconds(secs));
+  }
 }

src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java

@@ -296,7 +296,7 @@ private GraphQLObjectType createGraphQLType() {
             "A global minimum transfer time (in seconds) that specifies the minimum amount of time that must pass between exiting one transit vehicle and boarding another."
           )
           .type(Scalars.GraphQLInt)
-          .dataFetcher(env -> preferences.transfer().slack())
+          .dataFetcher(env -> preferences.transfer().slack().toSeconds())
           .build()
       )
       .field(

src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java

@@ -440,7 +440,7 @@ Normally this is when the search is performed (now), plus a small grace period t
             "This time is in addition to time it might take to walk between stops."
           )
           .type(Scalars.GraphQLInt)
-          .defaultValue(preferences.transfer().slack())
+          .defaultValue(preferences.transfer().slack().toSeconds())
           .build()
       )
       .argument(

src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java

@@ -15,19 +15,18 @@
 import io.micrometer.core.instrument.Metrics;
 import java.time.Duration;
 import java.time.LocalDate;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.opentripplanner._support.time.ZoneIds;
 import org.opentripplanner.apis.transmodel.TransmodelRequestContext;
 import org.opentripplanner.ext.emissions.DefaultEmissionsService;
@@ -403,6 +402,16 @@ public void testExplicitModes() {
     assertEquals(StreetMode.WALK, req.journey().transfer().mode());
   }
 
+  @ParameterizedTest
+  @ValueSource(strings = {"transferSlack",  "minimumTransferTime"})
+  public void testTransferSlack(String name) {
+    Map<String, Object> arguments = Map.of(
+      name, 101
+    );
+    var req = TripRequestMapper.createRequest(executionContext(arguments));
+    assertEquals(Duration.ofSeconds(101), req.preferences().transfer().slack());
+  }
+
   @Test
   public void testExplicitModesBikeAccess() {
     Map<String, Object> arguments = Map.of("modes", Map.of("accessMode", StreetMode.BIKE));

src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java

@@ -83,7 +83,7 @@ void testToString() {
     assertEquals(
       "TransferPreferences{" +
       "cost: $200, " +
-      "slack: 150, " +
+      "slack: 2m30s, " +
       "waitReluctance: 0.95, " +
       "maxTransfers: 17, " +
       "maxAdditionalTransfers: 7, " +

test/performance/skanetrafiken/speed-test-config.json

@@ -19,7 +19,7 @@
       "speed": 1.38,
       "reluctance": 5
     },
-    "transferSlack": 180,
+    "transferSlack": "3m",
     "waitReluctance": 0.175,
     "maxDirectStreetDuration": "1h1m",
     "boardSlackForMode": {