@opentripplanner/core-utils 9.0.0-alpha.2 → 9.0.0-alpha.4

package/src/__tests__/query-params.js

@@ -1,5 +1,6 @@
 import { reduceOtpFlexModes } from "../query";
 import queryParams, { getCustomQueryParams } from "../query-params";
+import { extractAdditionalModes, generateCombinations } from "../query-gen";
 
 const customWalkDistanceOptions = [
   {
@@ -12,6 +13,189 @@ const customWalkDistanceOptions = [
   }
 ];
 
+function modeStrToTransportMode(m) {
+  const splitVals = m.split("_");
+  return {
+    mode: splitVals[0],
+    qualifier: splitVals?.[1] || null
+  };
+}
+
+const mockLatLon = {
+  lat: 1,
+  lon: 2
+};
+
+function expectModes(modes, expectedModes) {
+  const generatedModesList = generateCombinations({
+    modes: modes.map(modeStrToTransportMode),
+    to: mockLatLon,
+    from: mockLatLon,
+    modeSettings: []
+  });
+  const expandedExpectedModesList = expectedModes.map(em => ({
+    modes: em.map(modeStrToTransportMode),
+    to: mockLatLon,
+    from: mockLatLon,
+    modeSettings: []
+  }));
+  return it(
+    modes.join(" "),
+    () =>
+      expect(generatedModesList.length === expandedExpectedModesList.length) &&
+      expect(new Set(generatedModesList)).toEqual(
+        new Set(expandedExpectedModesList)
+      )
+  );
+}
+
+describe("extract-modes", () => {
+  const mode = {
+    mode: "UNICYCLE"
+  };
+
+  const testTransportMode = {
+    mode: "testMode"
+  };
+
+  const checkboxModeSetting = {
+    type: "CHECKBOX",
+    icon: null,
+    label: "test",
+    applicableMode: testTransportMode.mode,
+    key: "test",
+    value: true,
+    addTransportMode: mode
+  };
+
+  const dropdownModeSetting = {
+    type: "DROPDOWN",
+    label: "test",
+    applicableMode: testTransportMode.mode,
+    key: "test",
+    options: [{ text: "testop", value: "1", addTransportMode: mode }],
+    value: "1"
+  };
+
+  it("a checkbox setting", () => {
+    expect(
+      extractAdditionalModes([checkboxModeSetting], [testTransportMode])
+    ).toEqual([mode]);
+  });
+  it("a dropdown setting", () => {
+    expect(
+      extractAdditionalModes([dropdownModeSetting], [testTransportMode])
+    ).toEqual([mode]);
+  });
+  it("a disabled mode setting", () => {
+    expect(
+      extractAdditionalModes(
+        [{ ...checkboxModeSetting, value: false }],
+        [testTransportMode]
+      )
+    ).toEqual([]);
+  });
+  it("a setting from a disabled mode", () => {
+    expect(extractAdditionalModes([{ ...checkboxModeSetting }], [])).toEqual(
+      []
+    );
+  });
+});
+
+describe("query-gen", () => {
+  describe("generateCombinations", () => {
+    expectModes(["WALK"], [["WALK"]]);
+    expectModes(["WALK", "TRANSIT"], [["WALK"], ["TRANSIT"]]);
+    expectModes(
+      ["WALK", "TRANSIT", "BICYCLE"],
+      [["WALK"], ["TRANSIT"], ["BICYCLE"], ["TRANSIT", "BICYCLE"]]
+    );
+    expectModes(
+      ["WALK", "TRANSIT", "CAR"],
+      [["WALK"], ["TRANSIT"], ["TRANSIT", "CAR"]]
+    );
+    expectModes(["TRANSIT", "CAR"], [["TRANSIT"], ["TRANSIT", "CAR"]]);
+    expectModes(["CAR"], []);
+    expectModes(
+      ["WALK", "TRANSIT", "BICYCLE", "CAR"],
+      [
+        ["WALK"],
+        ["TRANSIT"],
+        ["TRANSIT", "BICYCLE"],
+        ["BICYCLE"],
+        ["TRANSIT", "CAR"]
+      ]
+    );
+    expectModes(
+      ["BICYCLE_RENT", "TRANSIT", "WALK"],
+      [
+        ["TRANSIT"],
+        ["BICYCLE_RENT", "TRANSIT"],
+        ["BICYCLE_RENT", "WALK"],
+        ["WALK"]
+      ]
+    );
+    expectModes(
+      ["BICYCLE_RENT", "BICYCLE", "TRANSIT", "WALK"],
+      [
+        ["TRANSIT"],
+        ["BICYCLE_RENT", "TRANSIT"],
+        ["BICYCLE", "TRANSIT"],
+        ["BICYCLE_RENT", "WALK"],
+        ["BICYCLE"],
+        ["WALK"]
+      ]
+    );
+    expectModes(
+      ["SCOOTER_RENT", "BICYCLE_RENT", "TRANSIT", "WALK"],
+      [
+        ["TRANSIT"],
+        ["BICYCLE_RENT", "TRANSIT"],
+        ["BICYCLE_RENT", "WALK"],
+        ["SCOOTER_RENT", "TRANSIT"],
+        ["SCOOTER_RENT", "WALK"],
+        ["WALK"]
+      ]
+    );
+    expectModes(
+      ["FLEX", "TRANSIT", "WALK"],
+      [["TRANSIT"], ["FLEX", "TRANSIT"], ["FLEX", "WALK"], ["WALK"]]
+    );
+    expectModes(
+      ["FLEX", "SCOOTER_RENT", "TRANSIT", "WALK"],
+      [
+        ["TRANSIT"],
+        ["FLEX", "TRANSIT"],
+        ["WALK"],
+        ["FLEX", "WALK"],
+        ["FLEX", "SCOOTER_RENT", "WALK"], // Is this sensible?
+        ["FLEX", "SCOOTER_RENT", "TRANSIT"],
+        ["SCOOTER_RENT", "WALK"],
+        ["SCOOTER_RENT", "TRANSIT"]
+      ]
+    );
+    expectModes(
+      ["FLEX", "SCOOTER_RENT", "TRANSIT"],
+      [
+        ["TRANSIT"],
+        ["FLEX", "TRANSIT"],
+        ["FLEX", "SCOOTER_RENT", "TRANSIT"],
+        ["SCOOTER_RENT", "TRANSIT"]
+      ]
+    );
+    expectModes(
+      // Transit is required to enable other transit submodes
+      ["BUS", "RAIL", "GONDOLA", "TRAM", "TRANSIT"],
+      [["BUS", "RAIL", "GONDOLA", "TRAM"]]
+    );
+    expectModes(
+      // Transit is required to enable other transit submodes
+      ["TRANSIT"],
+      [["TRANSIT"]]
+    );
+  });
+});
+
 describe("query-params", () => {
   describe("getCustomQueryParams", () => {
     it("should return the original unmodified queryParams if no customizations", () => {

package/src/graphql.d.ts

@@ -0,0 +1,7 @@
+declare module "*.graphql" {
+  import { DocumentNode } from "graphql";
+
+  const Schema: DocumentNode;
+
+  export = Schema;
+}

package/src/index.ts

@@ -7,12 +7,14 @@ import * as route from "./route";
 import * as storage from "./storage";
 import * as time from "./time";
 import * as ui from "./ui";
+import * as queryGen from "./query-gen";
 
 const core = {
   itinerary,
   map,
   profile,
   query,
+  queryGen,
   queryParams,
   route,
   storage,

package/src/itinerary.ts

@@ -4,9 +4,10 @@ import {
   Config,
   ElevationProfile,
   FlexBookingInfo,
-  Itinerary,
+  ItineraryOnlyLegsRequired,
   LatLngArray,
   Leg,
+  MassUnitOption,
   Money,
   Place,
   Step,
@@ -212,7 +213,9 @@ export function getCompanyFromLeg(leg: Leg): string {
   return null;
 }
 
-export function getItineraryBounds(itinerary: Itinerary): LatLngArray[] {
+export function getItineraryBounds(
+  itinerary: ItineraryOnlyLegsRequired
+): LatLngArray[] {
   let coords = [];
   itinerary.legs.forEach(leg => {
     const legCoords = polyline
@@ -407,7 +410,7 @@ export function getTNCLocation(leg: Leg, type: string): string {
 }
 
 export function calculatePhysicalActivity(
-  itinerary: Itinerary
+  itinerary: ItineraryOnlyLegsRequired
 ): {
   bikeDuration: number;
   caloriesBurned: number;
@@ -433,7 +436,9 @@ export function calculatePhysicalActivity(
  * these values and currency info.
  * It is assumed that the same currency is used for all TNC legs.
  */
-export function calculateTncFares(itinerary: Itinerary): TncFare {
+export function calculateTncFares(
+  itinerary: ItineraryOnlyLegsRequired
+): TncFare {
   return itinerary.legs
     .filter(leg => leg.mode === "CAR" && leg.hailedCar && leg.tncData)
     .reduce(
@@ -501,15 +506,16 @@ const CARBON_INTENSITY_DEFAULTS = {
 };
 
 /**
- * @param  {itinerary} itinerary OTP trip itinierary
- * @param  {carbonIntensity} carbonIntensity carbon intensity by mode in grams/meter
+ * @param {itinerary} itinerary OTP trip itinierary, only legs is required.
+ * @param {carbonIntensity} carbonIntensity carbon intensity by mode in grams/meter
  * @param {units} units units to be used in return value
  * @return Amount of carbon in chosen unit
  */
 export function calculateEmissions(
-  itinerary: Itinerary,
+  // This type makes all the properties from Itinerary optional except legs.
+  itinerary: ItineraryOnlyLegsRequired,
   carbonIntensity: Record<string, number> = {},
-  units?: string
+  units?: MassUnitOption
 ): number {
   // Apply defaults for any values that we don't have.
   const carbonIntensityWithDefaults = {

package/src/planQuery.graphql

@@ -0,0 +1,141 @@
+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,
+) {
+	plan(
+		fromPlace: $fromPlace
+		toPlace: $toPlace
+		transportModes: $modes
+		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
+				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 {
+            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
+          relativeDirection
+          absoluteDirection
+          stayOn
+          streetName
+          area
+          alerts{
+            alertHeaderText
+            alertDescriptionText
+            alertUrl
+            effectiveStartDate
+          }
+					elevationProfile {
+						distance
+						elevation
+					}
+				}
+			}
+		}
+	}
+}

package/src/query-gen.ts

@@ -0,0 +1,206 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { print } from "graphql";
+import {
+  ModeSetting,
+  ModeSettingValues,
+  TransportMode
+} from "@opentripplanner/types";
+import { LonLatOutput } from "@conveyal/lonlat";
+import PlanQuery from "./planQuery.graphql";
+
+type OTPQueryParams = {
+  to: LonLatOutput & { name?: string };
+  from: LonLatOutput & { name?: string };
+  modes: Array<TransportMode>;
+  modeSettings: ModeSetting[];
+};
+
+type GraphQLQuery = {
+  query: string;
+  variables: Record<string, unknown>;
+};
+
+/**
+ * Mode Settings can contain additional modes to add to the query,
+ * this function extracts those additional modes from the settings
+ * and returns them in an array.
+ * @param modeSettings List of mode settings with values populated
+ * @returns Additional transport modes to add to query
+ */
+export function extractAdditionalModes(
+  modeSettings: ModeSetting[],
+  enabledModes: TransportMode[]
+): Array<TransportMode> {
+  return modeSettings.reduce<TransportMode[]>((prev, cur) => {
+    // First, ensure that the mode associated with this setting is even enabled
+    if (!enabledModes.map(m => m.mode).includes(cur.applicableMode)) {
+      return prev;
+    }
+
+    // In checkboxes, mode must be enabled and have a transport mode in it
+    if (cur.type === "CHECKBOX" && cur.addTransportMode && cur.value) {
+      return [...prev, cur.addTransportMode];
+    }
+    if (cur.type === "DROPDOWN") {
+      const transportMode = cur.options.find(o => o.value === cur.value)
+        .addTransportMode;
+      if (transportMode) {
+        return [
+          ...prev,
+          cur.options.find(o => o.value === cur.value).addTransportMode
+        ];
+      }
+    }
+    return prev;
+  }, []);
+}
+
+/**
+ * Generates every possible mathematical subset of the input TransportModes.
+ * Uses code from:
+ * https://stackoverflow.com/questions/5752002/find-all-possible-subset-combos-in-an-array
+ * @param array Array of input transport modes
+ * @returns 2D array representing every possible subset of transport modes from input
+ */
+function combinations(array: TransportMode[]): TransportMode[][] {
+  if (!array) return [];
+  return (
+    // eslint-disable-next-line no-bitwise
+    new Array(1 << array.length)
+      .fill(null)
+      // eslint-disable-next-line no-bitwise
+      .map((e1, i) => array.filter((e2, j) => i & (1 << j)))
+  );
+}
+
+export const SIMPLIFICATIONS = {
+  AIRPLANE: "TRANSIT",
+  BICYCLE: "PERSONAL",
+  BUS: "TRANSIT",
+  CABLE_CAR: "TRANSIT",
+  CAR: "CAR",
+  FERRY: "TRANSIT",
+  FLEX: "SHARED", // TODO: this allows FLEX+WALK. Is this reasonable?
+  FUNICULAR: "TRANSIT",
+  GONDOLA: "TRANSIT",
+  RAIL: "TRANSIT",
+  SCOOTER: "PERSONAL",
+  SUBWAY: "TRANSIT",
+  TRAM: "TRANSIT",
+  TRANSIT: "TRANSIT",
+  WALK: "WALK"
+};
+
+export const TRANSIT_SUBMODES = Object.keys(SIMPLIFICATIONS).filter(
+  mode => SIMPLIFICATIONS[mode] === "TRANSIT" && mode !== "TRANSIT"
+);
+export const TRANSIT_SUBMODES_AND_TRANSIT = Object.keys(SIMPLIFICATIONS).filter(
+  mode => SIMPLIFICATIONS[mode] === "TRANSIT"
+);
+
+/**
+ * Generates list of queries for OTP to get a comprehensive
+ * set of results based on the modes input.
+ * @param params OTP Query Params
+ * @returns Set of parameters to generate queries
+ */
+export function generateCombinations(params: OTPQueryParams): OTPQueryParams[] {
+  const VALID_COMBOS = [
+    ["WALK"],
+    ["PERSONAL"],
+    ["TRANSIT", "SHARED"],
+    ["WALK", "SHARED"],
+    ["TRANSIT"],
+    ["TRANSIT", "PERSONAL"],
+    ["TRANSIT", "CAR"]
+  ];
+
+  const BANNED_TOGETHER = ["SCOOTER", "BICYCLE"];
+
+  const completeModeList = [
+    ...extractAdditionalModes(params.modeSettings, params.modes),
+    ...params.modes
+  ];
+
+  // List of the transit *submodes* that are included in the input params
+  const queryTransitSubmodes = completeModeList
+    .filter(mode => TRANSIT_SUBMODES.includes(mode.mode))
+    .map(mode => mode.mode);
+
+  return combinations(completeModeList)
+    .filter(combo => {
+      if (combo.length === 0) return false;
+
+      // All current qualifiers currently simplify to "SHARED"
+      const simplifiedModes = Array.from(
+        new Set(
+          combo.map(c => (c.qualifier ? "SHARED" : SIMPLIFICATIONS[c.mode]))
+        )
+      );
+
+      // Ensure that if we have one transit mode, then we include ALL transit modes
+      if (simplifiedModes.includes("TRANSIT")) {
+        // Don't allow TRANSIT along with any other submodes
+        if (
+          queryTransitSubmodes.length &&
+          combo.find(c => c.mode === "TRANSIT")
+        ) {
+          return false;
+        }
+
+        if (
+          combo.reduce((prev, cur) => {
+            if (queryTransitSubmodes.includes(cur.mode)) {
+              return prev - 1;
+            }
+            return prev;
+          }, queryTransitSubmodes.length) !== 0
+        ) {
+          return false;
+        }
+        // Continue to the other checks
+      }
+
+      // OTP doesn't support multiple non-walk modes
+      if (BANNED_TOGETHER.every(m => combo.find(c => c.mode === m)))
+        return false;
+
+      return !!VALID_COMBOS.find(
+        vc =>
+          simplifiedModes.every(m => vc.includes(m)) &&
+          vc.every(m => simplifiedModes.includes(m))
+      );
+    })
+    .map(combo => ({ ...params, modes: combo }));
+}
+
+// eslint-disable-next-line import/prefer-default-export
+export function generateOtp2Query(params: OTPQueryParams): GraphQLQuery {
+  const { to, from, modeSettings } = params;
+
+  // This extracts the values from the mode settings to key value pairs
+  const modeSettingValues = modeSettings.reduce((prev, cur) => {
+    prev[cur.key] = cur.value;
+    return prev;
+  }, {}) as ModeSettingValues;
+
+  const {
+    walkReluctance,
+    wheelchair,
+    bikeReluctance,
+    carReluctance
+  } = modeSettingValues;
+
+  return {
+    query: print(PlanQuery),
+    variables: {
+      fromPlace: `${from.name}::${from.lat},${from.lon}}`,
+      toPlace: `${to.name}::${to.lat},${to.lon}}`,
+      modes: params.modes,
+      walkReluctance,
+      wheelchair,
+      bikeReluctance,
+      carReluctance
+    }
+  };
+}

package/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
+    "target": "es2019",
     "outDir": "./lib",
     "rootDir": "./src",
     "skipLibCheck": true