Uber ride hailing

doc-templates/RideHailing.md

@@ -0,0 +1,17 @@
+# Ride hailing services
+
+This sandbox feature allows you to use ride hailing services like Uber.
+
+## Contact Info
+
+- Leonard Ehrenfried, [[email protected]](mailto:[email protected])
+
+## Configuration
+
+In order enable this feature, add a new section `rideHailingServices` in `router-config.json`.
+
+The supported ride-hailing providers are listed below.
+
+### Uber
+
+<!-- INSERT: uber-car-hailing -->

docs/RouteRequest.md

@@ -587,7 +587,7 @@ The unit is cost unit per second of time difference.
 
 **Since version:** `2.1` ∙ **Type:** `enum map of duration` ∙ **Cardinality:** `Optional`   
 **Path:** /routingDefaults   
-**Enum keys:** `not-set` | `walk` | `bike` | `bike-to-park` | `bike-rental` | `scooter-rental` | `car` | `car-to-park` | `car-pickup` | `car-rental` | `flexible`
+**Enum keys:** `not-set` | `walk` | `bike` | `bike-to-park` | `bike-rental` | `scooter-rental` | `car` | `car-to-park` | `car-pickup` | `car-rental` | `car-hailing` | `flexible`
 
 Limit access/egress per street mode.
 
@@ -599,7 +599,7 @@ done because some street modes searches are much more resource intensive than ot
 
 **Since version:** `2.2` ∙ **Type:** `enum map of duration` ∙ **Cardinality:** `Optional`   
 **Path:** /routingDefaults   
-**Enum keys:** `not-set` | `walk` | `bike` | `bike-to-park` | `bike-rental` | `scooter-rental` | `car` | `car-to-park` | `car-pickup` | `car-rental` | `flexible`
+**Enum keys:** `not-set` | `walk` | `bike` | `bike-to-park` | `bike-rental` | `scooter-rental` | `car` | `car-to-park` | `car-pickup` | `car-rental` | `car-hailing` | `flexible`
 
 Limit direct route duration per street mode.
 

docs/RouterConfiguration.md

@@ -35,8 +35,9 @@ A full list of them can be found in the [RouteRequest](RouteRequest.md).
 |-------------------------------------------------------------------------------------------|:---------------------:|---------------------------------------------------------------------------------------------------|:----------:|---------------|:-----:|
 | [configVersion](#configVersion)                                                           |        `string`       | Deployment version of the *router-config.json*.                                                   | *Optional* |               |  2.1  |
 | [requestLogFile](#requestLogFile)                                                         |        `string`       | The path of the log file for the requests.                                                        | *Optional* |               |  2.0  |
-| [streetRoutingTimeout](#streetRoutingTimeout)                                             |       `duration`      | The maximum time a street routing request is allowed to take before returning a timeout.          | *Optional* | `"PT5S"`      |   na  |
+| [streetRoutingTimeout](#streetRoutingTimeout)                                             |       `duration`      | The maximum time a street routing request is allowed to take before returning a timeout.          | *Optional* | `"PT5S"`      |  2.2  |
 | [flex](sandbox/Flex.md)                                                                   |        `object`       | Configuration for flex routing.                                                                   | *Optional* |               |  2.1  |
+| [rideHailingServices](sandbox/RideHailing.md)                                             |       `object[]`      | Configuration for interfaces to external ride hailing services like Uber.                         | *Optional* |               |  2.3  |
 | [routingDefaults](RouteRequest.md)                                                        |        `object`       | The default parameters for the routing query.                                                     | *Optional* |               |  2.0  |
 | timetableUpdates                                                                          |        `object`       | Global configuration for timetable updaters.                                                      | *Optional* |               |  2.2  |
 | [transit](#transit)                                                                       |        `object`       | Configuration for transit searches with RAPTOR.                                                   | *Optional* |               |   na  |
@@ -54,7 +55,7 @@ A full list of them can be found in the [RouteRequest](RouteRequest.md).
 |    [pagingSearchWindowAdjustments](#transit_pagingSearchWindowAdjustments)                |      `duration[]`     | The provided array of durations is used to increase the search-window for the next/previous page. | *Optional* |               |   na  |
 |    [stopTransferCost](#transit_stopTransferCost)                                          | `enum map of integer` | Use this to set a stop transfer cost for the given transfer priority                              | *Optional* |               |  2.0  |
 |    [transferCacheRequests](#transit_transferCacheRequests)                                |       `object[]`      | Routing requests to use for pre-filling the stop-to-stop transfer cache.                          | *Optional* |               |  2.3  |
-| transmodelApi                                                                             |        `object`       | Configuration for the Transmodel GraphQL API.                                                     | *Optional* |               |   na  |
+| transmodelApi                                                                             |        `object`       | Configuration for the Transmodel GraphQL API.                                                     | *Optional* |               |  2.1  |
 |    [hideFeedId](#transmodelApi_hideFeedId)                                                |       `boolean`       | Hide the FeedId in all API output, and add it to input.                                           | *Optional* | `false`       |   na  |
 |    [tracingHeaderTags](#transmodelApi_tracingHeaderTags)                                  |       `string[]`      | Used to group requests when monitoring OTP.                                                       | *Optional* |               |   na  |
 | [updaters](UpdaterConfig.md)                                                              |       `object[]`      | Configuration for the updaters that import various types of data into OTP.                        | *Optional* |               |  1.5  |
@@ -127,7 +128,7 @@ number of transit vehicles used in that itinerary.
 
 <h3 id="streetRoutingTimeout">streetRoutingTimeout</h3>
 
-**Since version:** `na` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT5S"`   
+**Since version:** `2.2` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT5S"`   
 **Path:** / 
 
 The maximum time a street routing request is allowed to take before returning a timeout.
@@ -703,6 +704,14 @@ HTTP headers to add to the request. Any header key, value can be inserted.
         "timeout" : 300000
       }
     }
+  ],
+  "rideHailingServices" : [
+    {
+      "type" : "uber-car-hailing",
+      "clientId" : "secret-id",
+      "clientSecret" : "very-secret",
+      "wheelchairAccessibleRideType" : "car"
+    }
   ]
 }
 ```

docs/SandboxExtension.md

@@ -29,6 +29,7 @@ nearby stops generated by routing via OSM data.
 - [Travel Time (Isochrone & Surface) API](sandbox/TravelTime.md) - Travel Time API
 - [IBI accessibility score](sandbox/IBIAccessibilityScore.md) - IBI accessibility score
 - [Fares](sandbox/Fares.md) - Fare calculation
+- [Ride hailing](sandbox/RideHailing.md) - Ride hailing services like Uber
 
 
 ## Terminology

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

@@ -0,0 +1,6 @@
+{
+  "otpFeatures" : {
+    "SandboxAPILegacyGraphQLApi": true,
+    "VehicleToStopHeuristics": true
+  }
+}

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

@@ -12,7 +12,7 @@
     "geoidElevation": true
   },
   "transit": {
-    "maxNumberOfTransfers" : 4
+    "maxNumberOfTransfers": 4
   },
   "updaters": [
     {
@@ -56,5 +56,13 @@
       "sourceType": "gbfs",
       "url": "https://gbfs.spin.pm/api/gbfs/v2/portland"
     }
+  ],
+  "rideHailingServices": [
+    {
+      "type": "uber-car-hailing",
+      "clientId": "${UBER_CLIENT_ID}",
+      "clientSecret": "${UBER_CLIENT_SECRET}",
+      "wheelchairAccessibleRideType": "970ed376-bd33-4ad1-81c5-d2928a347a06"
+    }
   ]
 }

docs/sandbox/RideHailing.md

@@ -0,0 +1,44 @@
+# Ride hailing services
+
+This sandbox feature allows you to use ride hailing services like Uber.
+
+## Contact Info
+
+- Leonard Ehrenfried, [[email protected]](mailto:[email protected])
+
+## Configuration
+
+In order enable this feature, add a new section `rideHailingServices` in `router-config.json`.
+
+The supported ride-hailing providers are listed below.
+
+### Uber
+
+<!-- uber-car-hailing BEGIN -->
+<!-- NOTE! This section is auto-generated. Do not change, change doc in code instead. -->
+
+| Config Parameter             |   Type   | Summary                                                  |  Req./Opt. | Default Value | Since |
+|------------------------------|:--------:|----------------------------------------------------------|:----------:|---------------|:-----:|
+| type = "uber-car-hailing"    |  `enum`  | The type of the service.                                 | *Required* |               |  2.3  |
+| clientId                     | `string` | OAuth client id to access the API.                       | *Required* |               |  2.3  |
+| clientSecret                 | `string` | OAuth client secret to access the API.                   | *Required* |               |  2.3  |
+| wheelchairAccessibleRideType | `string` | The id of the requested wheelchair accessible ride type. | *Required* |               |  2.3  |
+
+
+##### Example configuration
+
+```JSON
+// router-config.json
+{
+  "rideHailingServices" : [
+    {
+      "type" : "uber-car-hailing",
+      "clientId" : "secret-id",
+      "clientSecret" : "very-secret",
+      "wheelchairAccessibleRideType" : "car"
+    }
+  ]
+}
+```
+
+<!-- uber-car-hailing END -->

mkdocs.yml

@@ -104,3 +104,4 @@ nav:
     - Travel Time Isochrones: 'sandbox/TravelTime.md'
     - IBI Accessibility Score: 'sandbox/IBIAccessibilityScore.md'
     - Fares: 'sandbox/Fares.md'
+    - Ride Hailing: 'sandbox/RideHailing.md'

pom.xml

@@ -311,7 +311,6 @@
                     </argLine>
                     <!-- Jenkins needs XML test reports to determine whether the build is stable. -->
                     <disableXmlReport>true</disableXmlReport>
-                    <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
             <!-- code coverage report -->

src/client/js/otp/config.js

@@ -350,5 +350,6 @@ otp.config.modes = {
     "FLEX_ACCESS,FLEX_EGRESS,TRANSIT" : _tr('Transit with flex access and egress'),
     //TRANSLATORS: Travel by: mode of transport (Used in selection in Travel Options widgets)
     "FLEX_DIRECT"              : _tr('Direct flex search'),
-    "CARPOOL,WALK"             : _tr("Carpool")
+    "CARPOOL,WALK"             : _tr("Carpool"),
+    "CAR_HAIL,TRANSIT,WALK"    : _tr("Car hailing and transit")
 };

src/ext-test/java/org/opentripplanner/ext/legacygraphqlapi/GraphQLIntegrationTest.java

@@ -6,6 +6,8 @@
 import static org.opentripplanner.model.plan.PlanTestConstants.B;
 import static org.opentripplanner.model.plan.PlanTestConstants.C;
 import static org.opentripplanner.model.plan.PlanTestConstants.D;
+import static org.opentripplanner.model.plan.PlanTestConstants.D10m;
+import static org.opentripplanner.model.plan.PlanTestConstants.E;
 import static org.opentripplanner.model.plan.PlanTestConstants.T11_00;
 import static org.opentripplanner.model.plan.PlanTestConstants.T11_01;
 import static org.opentripplanner.model.plan.PlanTestConstants.T11_15;
@@ -109,6 +111,7 @@ class GraphQLIntegrationTest {
       .walk(20, B)
       .bus(122, T11_01, T11_15, C)
       .rail(439, T11_30, T11_50, D)
+      .carHail(D10m, E)
       .build();
 
     var railLeg = i1.getTransitLeg(2);

src/ext-test/java/org/opentripplanner/ext/legacygraphqlapi/LegacyGraphQLScalarsTest.java

@@ -0,0 +1,52 @@
+package org.opentripplanner.ext.legacygraphqlapi;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import graphql.schema.CoercingSerializeException;
+import java.time.Duration;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.opentripplanner.framework.json.ObjectMappers;
+
+class LegacyGraphQLScalarsTest {
+
+  @Test
+  void duration() {
+    var string = LegacyGraphQLScalars.durationScalar
+      .getCoercing()
+      .serialize(Duration.ofMinutes(30));
+    assertEquals("PT30M", string);
+  }
+
+  @Test
+  void nonDuration() {
+    Assertions.assertThrows(
+      CoercingSerializeException.class,
+      () -> LegacyGraphQLScalars.durationScalar.getCoercing().serialize(new Object())
+    );
+  }
+
+  @Test
+  void geoJson() throws JsonProcessingException {
+    var gm = new GeometryFactory();
+    var polygon = gm.createPolygon(
+      new Coordinate[] {
+        new Coordinate(0, 0),
+        new Coordinate(1, 1),
+        new Coordinate(2, 2),
+        new Coordinate(0, 0),
+      }
+    );
+    var geoJson = LegacyGraphQLScalars.geoJsonScalar.getCoercing().serialize(polygon);
+
+    var jsonNode = ObjectMappers
+      .ignoringExtraFields()
+      .readTree(
+        "{\"type\":\"Polygon\",\"coordinates\":[[[0.0,0.0],[1.0,1.0],[2.0,2.0],[0.0,0.0]]]}"
+      );
+    assertEquals(jsonNode, geoJson);
+  }
+}

src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingDepartureTimeShifterTest.java

@@ -0,0 +1,61 @@
+package org.opentripplanner.ext.ridehailing;
+
+import static graphql.Assert.assertTrue;
+import static java.time.Duration.ofMinutes;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.opentripplanner._support.time.ZoneIds;
+import org.opentripplanner.model.GenericLocation;
+import org.opentripplanner.routing.api.request.RequestModes;
+import org.opentripplanner.routing.api.request.RouteRequest;
+import org.opentripplanner.routing.api.request.StreetMode;
+import org.opentripplanner.test.support.VariableSource;
+
+class RideHailingDepartureTimeShifterTest {
+
+  static Instant instant = OffsetDateTime.parse("2023-03-23T17:13:46+01:00").toInstant();
+
+  RideHailingService service = new TestRideHailingService(
+    TestRideHailingService.DEFAULT_ARRIVAL_TIMES,
+    List.of()
+  );
+
+  static Stream<Arguments> testCases = Stream.of(
+    // leave now, so shift by 10 minutes
+    Arguments.of(instant, instant.plus(TestRideHailingService.DEFAULT_ARRIVAL_DURATION)),
+    Arguments.of(instant.plus(ofMinutes(15)), instant.plus(ofMinutes(15))),
+    // no shifting because it's in the future
+    Arguments.of(instant.plus(ofMinutes(30)), instant.plus(ofMinutes(30))),
+    Arguments.of(instant.plus(ofMinutes(40)), instant.plus(ofMinutes(40))),
+    // only shift by 9 minutes because we are wanting to leave in one minute
+    Arguments.of(instant.plus(ofMinutes(1)), instant.plus(ofMinutes(10)))
+  );
+
+  @ParameterizedTest
+  @VariableSource("testCases")
+  void shift(Instant searchTime, Instant expectedTimeAfterShifting) {
+    var req = new RouteRequest();
+    req.setTo(new GenericLocation(0d, 0d));
+    req.setFrom(new GenericLocation(0d, 0d));
+    req.setDateTime(searchTime);
+    req.journey().setModes(RequestModes.of().withAccessMode(StreetMode.CAR_HAILING).build());
+
+    var result = RideHailingDepartureTimeShifter.shiftDepartureTime(req, List.of(service), instant);
+
+    assertTrue(result.isSuccess());
+    var shifted = result.successValue();
+
+    var time = OffsetDateTime.ofInstant(shifted.dateTime(), ZoneIds.BERLIN);
+
+    var expectedTime = OffsetDateTime.ofInstant(expectedTimeAfterShifting, ZoneIds.BERLIN);
+
+    // start time should be shifted by 10 minutes
+    assertEquals(expectedTime.toString(), time.toString());
+  }
+}