@opentripplanner/core-utils 8.2.0 → 8.2.2

package/src/planQuery.graphql

@@ -1,146 +1,174 @@
 query PlanQuery(
-	$fromPlace: String!,
-	$toPlace: String!,
-	$modes: [TransportMode],
-	$time: String,
-	$date: String,
-	$wheelchair: Boolean,
-	$bikeReluctance: Float,
-	$carReluctance: Float,
-	$walkReluctance: Float,
-	$arriveBy: Boolean,
-	$intermediatePlaces: [InputCoordinates],
-	$preferred: InputPreferred,
-	$unpreferred: InputUnpreferred,
-	$banned: InputBanned,
+  $fromPlace: String!
+  $toPlace: String!
+  $modes: [TransportMode]
+  $time: String
+  $date: String
+  $wheelchair: Boolean
+  $bikeReluctance: Float
+  $carReluctance: Float
+  $walkReluctance: Float
+  $arriveBy: Boolean
+  $intermediatePlaces: [InputCoordinates]
+  $preferred: InputPreferred
+  $unpreferred: InputUnpreferred
+  $banned: InputBanned
+  $numItineraries: Int
 ) {
-	plan(
-		fromPlace: $fromPlace
-		toPlace: $toPlace
-		transportModes: $modes
-		# Currently only supporting EN locale, used for times and text
-		locale: "en",
-		time: $time,
-		date: $date,
-		wheelchair: $wheelchair,
-		bikeReluctance: $bikeReluctance,
-		carReluctance: $carReluctance,
-		walkReluctance: $walkReluctance,
-		arriveBy: $arriveBy,
-		intermediatePlaces: $intermediatePlaces,
-		preferred: $preferred,
-		unpreferred: $unpreferred,
-		banned: $banned,
-	) {
-		itineraries {
-			duration
-			endTime
-			startTime
-			waitingTime
-			walkTime
-			legs {
-				distance
-				duration
-				endTime
-				mode
-				realTime
-				realtimeState	
-				startTime
-				transitLeg
-				trip {
-					id
-					gtfsId
-				}
-				agency {
-					name
-					id
-					timezone
-					url
-					alerts {
+  plan(
+    fromPlace: $fromPlace
+    toPlace: $toPlace
+    transportModes: $modes
+    # Currently only supporting EN locale, used for times and text
+    locale: "en"
+    time: $time
+    date: $date
+    wheelchair: $wheelchair
+    bikeReluctance: $bikeReluctance
+    carReluctance: $carReluctance
+    walkReluctance: $walkReluctance
+    arriveBy: $arriveBy
+    intermediatePlaces: $intermediatePlaces
+    preferred: $preferred
+    unpreferred: $unpreferred
+    banned: $banned
+    numItineraries: $numItineraries
+  ) {
+    routingErrors {
+      code
+      inputField
+      description
+    }
+    itineraries {
+      duration
+      endTime
+      startTime
+      waitingTime
+      walkTime
+      legs {
+        pickupType
+        dropoffType
+        pickupBookingInfo {
+          earliestBookingTime {
+            daysPrior
+          }
+        }
+        rentedBike
+        interlineWithPreviousLeg
+        departureDelay
+        arrivalDelay
+        distance
+        duration
+        endTime
+        mode
+        realTime
+        realtimeState
+        startTime
+        transitLeg
+        trip {
+          id
+          gtfsId
+          tripHeadsign
+        }
+        agency {
+          name
+          id
+          timezone
+          url
+          alerts {
             alertHeaderText
             alertDescriptionText
             alertUrl
             effectiveStartDate
           }
-				}
-				legGeometry {
-					length
-					points
-				}
-				intermediateStops {
-					lat
-					lon
-					name
-					stopCode: code
-					stopId: id
-					locationType
-				}
-				route {
-					shortName
-					color
-					textColor
-					id
-					type
-					alerts {
+        }
+        legGeometry {
+          length
+          points
+        }
+        intermediateStops {
+          lat
+          lon
+          name
+          stopCode: code
+          stopId: id
+          locationType
+        }
+        route {
+          shortName
+          longName
+          color
+          textColor
+          id
+          type
+          alerts {
             alertHeaderText
             alertDescriptionText
             alertUrl
             effectiveStartDate
           }
-				}
-				from {
-					lat
-					lon
-					name
-					vertexType
-					stop {
-						id
-						code
-						alerts {
-							alertHeaderText
-							alertDescriptionText
-							alertUrl
-							effectiveStartDate
-						}	
-					}
-				}
-				to {
-					lat
-					lon
-					name
-					vertexType
-					stop {
-						id
-						code
-						alerts {
-							alertHeaderText
-							alertDescriptionText
-							alertUrl
-							effectiveStartDate
-						}
-					}
-				}
-				steps {
-					distance
-					lat
-					lon
+        }
+        from {
+          lat
+          lon
+          name
+          vertexType
+          rentalVehicle {
+            network
+          }
+          stop {
+            id
+            code
+            gtfsId
+            alerts {
+              alertHeaderText
+              alertDescriptionText
+              alertUrl
+              effectiveStartDate
+            }
+          }
+        }
+        to {
+          lat
+          lon
+          name
+          vertexType
+          rentalVehicle {
+            network
+          }
+          stop {
+            id
+            code
+            gtfsId
+            alerts {
+              alertHeaderText
+              alertDescriptionText
+              alertUrl
+              effectiveStartDate
+            }
+          }
+        }
+        steps {
+          distance
+          lat
+          lon
           relativeDirection
           absoluteDirection
           stayOn
           streetName
           area
-          alerts{
+          alerts {
             alertHeaderText
             alertDescriptionText
             alertUrl
             effectiveStartDate
           }
-					elevationProfile {
-						distance
-						elevation
-					}
-				}
-			}
-		}
-	}
+          elevationProfile {
+            distance
+            elevation
+          }
+        }
+      }
+    }
+  }
 }

package/src/query-gen.ts

@@ -8,11 +8,31 @@ import {
 
 import PlanQuery from "./planQuery.graphql";
 
+type InputBanned = {
+  routes?: string;
+  agencies?: string;
+  trips?: string;
+  stops?: string;
+  stopsHard?: string;
+};
+
+type InputPreferred = {
+  routes?: string;
+  agencies?: string;
+  unpreferredCost?: string;
+};
+
 type OTPQueryParams = {
+  arriveBy: boolean;
+  date?: string;
   from: LonLatOutput & { name?: string };
   modes: TransportMode[];
   modeSettings: ModeSetting[];
+  time?: string;
+  numItineraries?: number;
   to: LonLatOutput & { name?: string };
+  banned?: InputBanned;
+  preferred?: InputPreferred;
 };
 
 type GraphQLQuery = {
@@ -176,13 +196,22 @@ export function generateCombinations(params: OTPQueryParams): OTPQueryParams[] {
 }
 
 export function generateOtp2Query({
+  arriveBy,
+  banned,
+  date,
   from,
-  modeSettings,
   modes,
+  modeSettings,
+  numItineraries,
+  preferred,
+  time,
   to
 }: OTPQueryParams): GraphQLQuery {
   // This extracts the values from the mode settings to key value pairs
   const modeSettingValues = modeSettings.reduce((prev, cur) => {
+    if (cur.type === "SLIDER" && cur.inverseKey) {
+      prev[cur.inverseKey] = cur.high - cur.value + cur.low;
+    }
     prev[cur.key] = cur.value;
     return prev;
   }, {}) as ModeSettingValues;
@@ -197,10 +226,16 @@ export function generateOtp2Query({
   return {
     query: print(PlanQuery),
     variables: {
+      arriveBy,
+      banned,
       bikeReluctance,
       carReluctance,
+      date,
       fromPlace: `${from.name}::${from.lat},${from.lon}}`,
       modes,
+      numItineraries,
+      preferred,
+      time,
       toPlace: `${to.name}::${to.lat},${to.lon}}`,
       walkReluctance,
       wheelchair