@opentripplanner/core-utils 12.0.2 → 12.2.0

package/lib/__mocks__/fake-transit-operators.story.json

@@ -0,0 +1,97 @@
+{
+  "fakeTransitOperators": [
+    {
+      "feedId": "kcm",
+      "agencyId": "kcm:23",
+      "name": "City of Seattle",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_4_City_of_Seattle.png"
+    },
+    {
+      "feedId": "CommTrans",
+      "agencyId": "CommTrans:29",
+      "name": "Community Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_community_transit.png"
+    },
+    {
+      "feedId": "97",
+      "agencyId": "97:97",
+      "name": "Everett Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_Everett_Transit.png"
+    },
+    {
+      "feedId": "19",
+      "agencyId": "19:0",
+      "name": "Intercity Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/intercity_transit_logo.jpg"
+    },
+    {
+      "feedId": "kcm",
+      "agencyId": "kcm:1",
+      "name": "King County Metro",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_kcm.png"
+    },
+    {
+      "feedId": "Kitsap",
+      "agencyId": "Kitsap:kt",
+      "name": "Kitsap Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_Kitsap_Transit.png",
+      "order": 2
+    },
+    {
+      "feedId": "3",
+      "agencyId": "3:3",
+      "name": "Pierce Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_pierce_transit.png"
+    },
+    {
+      "feedId": "Skagit",
+      "agencyId": "Skagit:e0e4541a-2714-487b-b30c-f5c6cb4a310f",
+      "name": "Skagit Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_Skagit.png"
+    },
+    {
+      "feedId": "96",
+      "agencyId": "96:96",
+      "name": "Seattle Center Monorail",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_seattle_monorail.png"
+    },
+    {
+      "feedId": "40",
+      "agencyId": "40:40",
+      "name": "Sound Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_sound_transit.png",
+      "order": 1
+    },
+    {
+      "feedId": "CommTrans",
+      "agencyId": "CommTrans:40",
+      "name": "Sound Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_sound_transit.png"
+    },
+    {
+      "feedId": "kcm",
+      "agencyId": "kcm:40",
+      "name": "Sound Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_sound_transit.png"
+    },
+    {
+      "feedId": "3",
+      "agencyId": "3:40",
+      "name": "Sound Transit",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_sound_transit.png",
+      "order": 1
+    },
+    {
+      "feedId": "95",
+      "agencyId": "95:95",
+      "name": "Washington State Ferries",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_wash_state_ferry.png"
+    },
+    {
+      "feedId": "Whatcom",
+      "agencyId": "Whatcom:14",
+      "name": "Whatcom Transportation Authority",
+      "logo": "https://s3.amazonaws.com/datatools-production/branding/agency_2_wta.png"
+    }
+  ]
+}

package/lib/__tests__/__mocks__/routes.json

@@ -1,107 +1,236 @@
 {
-  "route1": {
-    "longName": "Across town",
-    "mode": "BUS",
-    "shortName": "10",
-    "sortOrder": 10
-  },
-  "route2": {
-    "longName": "Around town",
-    "mode": "BUS",
-    "shortName": "20",
-    "sortOrder": 2
-  },
-  "route3": {
-    "longName": "Around another town",
-    "shortName": "3",
-    "sortOrder": -999,
-    "type": 3
-  },
-  "route4": {
-    "longName": "Loop route",
-    "mode": "BUS",
-    "shortName": "2",
-    "sortOrder": -999
-  },
-  "route5": {
-    "longName": "A-line",
-    "mode": "BUS",
-    "shortName": "A",
-    "sortOrder": -999
-  },
-  "route6": {
-    "longName": "B-line",
-    "mode": "BUS",
-    "shortName": "B",
-    "sortOrder": -999
-  },
-  "route7": {
-    "longName": "A meandering route",
-    "mode": "BUS",
-    "sortOrder": -999
-  },
-  "route8": {
-    "longName": "Zig-zagging route",
-    "mode": "BUS",
-    "shortName": "30",
-    "sortOrder": 2
-  },
-  "route9": {
-    "longName": "Express route",
-    "mode": "BUS",
-    "shortName": "30",
-    "sortOrder": 2
-  },
-  "route10": {
-    "longName": "Variation of express route",
-    "mode": "BUS",
-    "shortName": "30",
-    "sortOrder": 2
-  },
-  "route11": {
-    "longName": "Local route",
-    "mode": "BUS",
-    "shortName": "6",
-    "sortOrder": 2
-  },
-  "route12": {
-    "longName": "Intercity Train",
-    "mode": "RAIL",
-    "shortName": "IC",
-    "sortOrder": 2
-  },
-  "route13": {
-    "longName": "Yellow line Subway",
-    "mode": "SUBWAY",
-    "shortName": "Yellow",
-    "sortOrder": 2
-  },
-  "route14": {
-    "longName": "Xpress route C",
-    "mode": "BUS",
-    "shortName": "30C",
-    "sortOrder": 2
-  },
-  "route15": {
-    "longName": "Express route X",
-    "mode": "BUS",
-    "shortName": "30X",
-    "sortOrder": 2
-  },
-  "route16": {
-    "agencyId": "abc",
-    "agencyName": "Agency 1",
-    "longName": "Intercity Train 2",
-    "mode": "RAIL",
-    "routeId": "1:it2",
-    "shortName": "IC"
-  },
-  "route17": {
-    "agencyId": "abc",
-    "agencyName": "Acclaimed agency 1",
-    "longName": "Express route X",
-    "mode": "BUS",
-    "routeId": "2:erx",
-    "shortName": "30X"
-  }
+  "otp1Routes": [
+    {
+      "agencyId": "bcd",
+      "longName": "Across town",
+      "mode": "BUS",
+      "shortName": "10",
+      "sortOrder": 10
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Around town",
+      "mode": "BUS",
+      "shortName": "20",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Around another town",
+      "shortName": "3",
+      "sortOrder": -999,
+      "type": 3
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Loop route",
+      "mode": "BUS",
+      "shortName": "2",
+      "sortOrder": -999
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "A-line",
+      "mode": "BUS",
+      "shortName": "A",
+      "sortOrder": -999
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "B-line",
+      "mode": "BUS",
+      "shortName": "B",
+      "sortOrder": -999
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "A meandering route",
+      "mode": "BUS",
+      "sortOrder": -999
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Zig-zagging route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Express route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Variation of express route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Local route",
+      "mode": "BUS",
+      "shortName": "6",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Intercity Train",
+      "mode": "RAIL",
+      "shortName": "IC",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Yellow line Subway",
+      "mode": "SUBWAY",
+      "shortName": "Yellow",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Xpress route C",
+      "mode": "BUS",
+      "shortName": "30C",
+      "sortOrder": 2
+    },
+    {
+      "agencyId": "bcd",
+      "longName": "Express route X",
+      "mode": "BUS",
+      "shortName": "30X"
+    },
+    {
+      "agencyId": "abc",
+      "agencyName": "Agency 1",
+      "longName": "Intercity Train 2",
+      "mode": "RAIL",
+      "routeId": "1:it2",
+      "shortName": "IC",
+      "sortOrder": 10
+    },
+    {
+      "agencyId": "abc",
+      "agencyName": "Acclaimed agency 1",
+      "longName": "Express route X",
+      "mode": "BUS",
+      "routeId": "2:erx",
+      "shortName": "30X",
+      "sortOrder": 10
+    }
+  ],
+  "otp2Routes": [
+    {
+      "longName": "Across town",
+      "mode": "BUS",
+      "shortName": "10",
+      "sortOrder": 10
+    },
+    {
+      "longName": "Around town",
+      "mode": "BUS",
+      "shortName": "20",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Around another town",
+      "shortName": "3",
+      "sortOrder": null,
+      "type": 3
+    },
+    {
+      "longName": "Loop route",
+      "mode": "BUS",
+      "shortName": "2",
+      "sortOrder": -999
+    },
+    {
+      "longName": "A-line",
+      "mode": "BUS",
+      "shortName": "A",
+      "sortOrder": -999
+    },
+    {
+      "longName": "B-line",
+      "mode": "BUS",
+      "shortName": "B"
+    },
+    {
+      "longName": "A meandering route",
+      "mode": "BUS"
+    },
+    {
+      "longName": "Zig-zagging route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Express route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Variation of express route",
+      "mode": "BUS",
+      "shortName": "30",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Local route",
+      "mode": "BUS",
+      "shortName": "6",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Intercity Train",
+      "mode": "RAIL",
+      "shortName": "IC",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Yellow line Subway",
+      "mode": "SUBWAY",
+      "shortName": "Yellow",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Xpress route C",
+      "mode": "BUS",
+      "shortName": "30C",
+      "sortOrder": 2
+    },
+    {
+      "longName": "Express route X",
+      "mode": "BUS",
+      "shortName": "30X",
+      "sortOrder": 2
+    },
+    {
+      "agency": {
+        "name": "Agency 1",
+        "id": "abc"
+      },
+      "longName": "Intercity Train 2",
+      "mode": "RAIL",
+      "routeId": "1:it2",
+      "shortName": "IC",
+      "sortOrder": 2
+    },
+    {
+      "agency": {
+        "name": "Acclaimed agency 1",
+        "id": "abc"
+      },
+      "longName": "Express route X",
+      "mode": "BUS",
+      "routeId": "2:erx",
+      "shortName": "30X",
+      "sortOrder": 2
+    }
+  ]
 }

package/lib/query-gen.js

@@ -124,7 +124,7 @@ function isCombinationValid(combo, queryTransitSubmodes) {
     return false;
   }
 
-  return !!VALID_COMBOS.find(vc => simplifiedModes.every(m => vc.includes(m)) && vc.every(m => simplifiedModes.includes(m)));
+  return !!VALID_COMBOS.find(vc => simplifiedModes.length === vc.length && vc.every(m => simplifiedModes.includes(m)));
 }
 /**
  * Generates a list of queries for OTP to get a comprehensive

package/lib/query-gen.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/query-gen.ts"],"names":["extractAdditionalModes","modeSettings","enabledModes","reduce","prev","cur","map","m","mode","includes","applicableMode","type","addTransportMode","value","newTransportModes","Array","isArray","transportMode","options","find","o","combinations","array","length","fill","e1","i","filter","e2","j","SIMPLIFICATIONS","AIRPLANE","BICYCLE","BUS","CABLE_CAR","CAR","FERRY","FLEX","FUNICULAR","GONDOLA","RAIL","MONORAIL","SCOOTER","SUBWAY","TROLLEYBUS","TRAM","TRANSIT","WALK","VALID_COMBOS","BANNED_TOGETHER","TRANSIT_SUBMODES","Object","keys","TRANSIT_SUBMODES_AND_TRANSIT","isCombinationValid","combo","queryTransitSubmodes","simplifiedModes","from","Set","c","qualifier","vc","every","generateCombinations","params","completeModeList","modes","generateOtp2Query","otpQueryParams","planQuery","DefaultPlanQuery","to","otherOtpQueryParams","modeSettingValues","inverseKey","high","low","key","truthValue","falseValue","bikeReluctance","carReluctance","walkReluctance","walkSpeed","wheelchair","query","variables","fromPlace","name","lat","lon","toPlace"],"mappings":"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","sourcesContent":["import { LonLatOutput } from \"@conveyal/lonlat\";\nimport { print } from \"graphql\";\nimport {\n  ModeSetting,\n  ModeSettingValues,\n  TransportMode\n} from \"@opentripplanner/types\";\n\nimport DefaultPlanQuery from \"./planQuery.graphql\";\n\ntype InputBanned = {\n  routes?: string;\n  agencies?: string;\n  trips?: string;\n  stops?: string;\n  stopsHard?: string;\n};\n\ntype InputPreferred = {\n  routes?: string;\n  agencies?: string;\n  unpreferredCost?: string;\n};\n\ntype OTPQueryParams = {\n  arriveBy: boolean;\n  date?: string;\n  from: LonLatOutput & { name?: string };\n  modes: TransportMode[];\n  modeSettings: ModeSetting[];\n  time?: string;\n  numItineraries?: number;\n  to: LonLatOutput & { name?: string };\n  banned?: InputBanned;\n  preferred?: InputPreferred;\n  unpreferred?: InputPreferred;\n};\n\ntype GraphQLQuery = {\n  query: string;\n  variables: Record<string, unknown>;\n};\n\n/**\n * Mode Settings can contain additional modes to add to the query,\n * this function extracts those additional modes from the settings\n * and returns them in an array.\n * @param modeSettings List of mode settings with values populated\n * @returns Additional transport modes to add to query\n */\nexport function extractAdditionalModes(\n  modeSettings: ModeSetting[],\n  enabledModes: TransportMode[]\n): TransportMode[] {\n  return modeSettings.reduce<TransportMode[]>((prev, cur) => {\n    // First, ensure that the mode associated with this setting is even enabled\n    if (!enabledModes.map(m => m.mode).includes(cur.applicableMode)) {\n      return prev;\n    }\n\n    // In checkboxes, mode must be enabled and have a transport mode in it\n    if (\n      (cur.type === \"CHECKBOX\" || cur.type === \"SUBMODE\") &&\n      cur.addTransportMode &&\n      cur.value\n    ) {\n      const newTransportModes = Array.isArray(cur.addTransportMode)\n        ? cur.addTransportMode\n        : [cur.addTransportMode];\n      return [...prev, ...newTransportModes];\n    }\n    if (cur.type === \"DROPDOWN\") {\n      const transportMode = cur.options.find(o => o.value === cur.value)\n        ?.addTransportMode;\n      if (transportMode) {\n        return [...prev, transportMode];\n      }\n    }\n    return prev;\n  }, []);\n}\n\n/**\n * Generates every possible mathematical subset of the input TransportModes.\n * Uses code from:\n * https://stackoverflow.com/questions/5752002/find-all-possible-subset-combos-in-an-array\n * @param array Array of input transport modes\n * @returns 2D array representing every possible subset of transport modes from input\n */\nfunction combinations(array: TransportMode[]): TransportMode[][] {\n  if (!array) return [];\n  return (\n    // eslint-disable-next-line no-bitwise\n    new Array(1 << array.length)\n      .fill(null)\n      // eslint-disable-next-line no-bitwise\n      .map((e1, i) => array.filter((e2, j) => i & (1 << j)))\n  );\n}\n\n/**\n * This constant maps all the transport mode to a broader mode type,\n * which is used to determine the valid combinations of modes used in query generation.\n */\nexport const SIMPLIFICATIONS = {\n  AIRPLANE: \"TRANSIT\",\n  BICYCLE: \"PERSONAL\",\n  BUS: \"TRANSIT\",\n  CABLE_CAR: \"TRANSIT\",\n  CAR: \"CAR\",\n  FERRY: \"TRANSIT\",\n  FLEX: \"SHARED\", // TODO: this allows FLEX+WALK. Is this reasonable?\n  FUNICULAR: \"TRANSIT\",\n  GONDOLA: \"TRANSIT\",\n  RAIL: \"TRANSIT\",\n  MONORAIL: \"TRANSIT\",\n  SCOOTER: \"PERSONAL\",\n  SUBWAY: \"TRANSIT\",\n  TROLLEYBUS: \"TRANSIT\",\n  TRAM: \"TRANSIT\",\n  TRANSIT: \"TRANSIT\",\n  WALK: \"WALK\"\n};\n\n// Inclusion of \"TRANSIT\" alone automatically implies \"WALK\" in OTP\nconst VALID_COMBOS = [\n  [\"WALK\"],\n  [\"PERSONAL\"],\n  [\"TRANSIT\", \"SHARED\"],\n  [\"WALK\", \"SHARED\"],\n  [\"TRANSIT\"],\n  [\"TRANSIT\", \"PERSONAL\"],\n  [\"TRANSIT\", \"CAR\"]\n];\n\nconst BANNED_TOGETHER = [\"SCOOTER\", \"BICYCLE\", \"CAR\"];\n\nexport const TRANSIT_SUBMODES = Object.keys(SIMPLIFICATIONS).filter(\n  mode => SIMPLIFICATIONS[mode] === \"TRANSIT\" && mode !== \"TRANSIT\"\n);\nexport const TRANSIT_SUBMODES_AND_TRANSIT = Object.keys(SIMPLIFICATIONS).filter(\n  mode => SIMPLIFICATIONS[mode] === \"TRANSIT\"\n);\n\nfunction isCombinationValid(\n  combo: TransportMode[],\n  queryTransitSubmodes: string[]\n): boolean {\n  if (combo.length === 0) return false;\n\n  // All current qualifiers currently simplify to \"SHARED\"\n  const simplifiedModes = Array.from(\n    new Set(combo.map(c => (c.qualifier ? \"SHARED\" : SIMPLIFICATIONS[c.mode])))\n  );\n\n  // Ensure that if we have one transit mode, then we include ALL transit modes\n  if (simplifiedModes.includes(\"TRANSIT\")) {\n    // Don't allow TRANSIT along with any other submodes\n    if (queryTransitSubmodes.length && combo.find(c => c.mode === \"TRANSIT\")) {\n      return false;\n    }\n\n    if (\n      combo.reduce((prev, cur) => {\n        if (queryTransitSubmodes.includes(cur.mode)) {\n          return prev - 1;\n        }\n        return prev;\n      }, queryTransitSubmodes.length) !== 0\n    ) {\n      return false;\n    }\n    // Continue to the other checks\n  }\n\n  // OTP doesn't support multiple non-walk modes\n  if (BANNED_TOGETHER.filter(m => combo.find(c => c.mode === m)).length > 1) {\n    return false;\n  }\n\n  return !!VALID_COMBOS.find(\n    vc =>\n      simplifiedModes.every(m => vc.includes(m)) &&\n      vc.every(m => simplifiedModes.includes(m))\n  );\n}\n\n/**\n * Generates a list of queries for OTP to get a comprehensive\n * set of results based on the modes input.\n * @param params OTP Query Params\n * @returns Set of parameters to generate queries\n */\nexport function generateCombinations(params: OTPQueryParams): OTPQueryParams[] {\n  const completeModeList = [\n    ...extractAdditionalModes(params.modeSettings, params.modes),\n    ...params.modes\n  ];\n\n  // List of the transit *submodes* that are included in the input params\n  const queryTransitSubmodes = completeModeList\n    .filter(mode => TRANSIT_SUBMODES.includes(mode.mode))\n    .map(mode => mode.mode);\n\n  return combinations(completeModeList)\n    .filter(combo => isCombinationValid(combo, queryTransitSubmodes))\n    .map(combo => ({ ...params, modes: combo }));\n}\n\n/**\n * Generates a query for OTP GraphQL API based on parameters.\n * @param param0 OTP2 Parameters for the query\n * @param planQuery Override the default query for OTP\n * @returns A fully formed query+variables ready to be sent to GraphQL backend\n */\nexport function generateOtp2Query(\n  otpQueryParams: OTPQueryParams,\n  planQuery = DefaultPlanQuery\n): GraphQLQuery {\n  const { from, modeSettings, to, ...otherOtpQueryParams } = otpQueryParams;\n\n  // This extracts the values from the mode settings to key value pairs\n  const modeSettingValues = modeSettings.reduce((prev, cur) => {\n    if (cur.type === \"SLIDER\" && cur.inverseKey) {\n      prev[cur.inverseKey] = cur.high - cur.value + cur.low;\n    }\n    prev[cur.key] = cur.value;\n\n    // If we assign a value on true, return the value (or null) instead of a boolean.\n    if (cur.type === \"CHECKBOX\" && cur.truthValue) {\n      prev[cur.key] =\n        cur.value === true ? cur.truthValue : cur.falseValue ?? null;\n    }\n    return prev;\n  }, {}) as ModeSettingValues;\n\n  const {\n    bikeReluctance,\n    carReluctance,\n    walkReluctance,\n    walkSpeed,\n    wheelchair\n  } = modeSettingValues;\n\n  return {\n    query: print(planQuery),\n    variables: {\n      ...otherOtpQueryParams,\n      bikeReluctance,\n      carReluctance,\n      fromPlace: `${from.name}::${from.lat},${from.lon}`,\n      toPlace: `${to.name}::${to.lat},${to.lon}`,\n      walkReluctance,\n      walkSpeed,\n      wheelchair\n    }\n  };\n}\n"],"file":"query-gen.js"}
+{"version":3,"sources":["../src/query-gen.ts"],"names":["extractAdditionalModes","modeSettings","enabledModes","reduce","prev","cur","map","m","mode","includes","applicableMode","type","addTransportMode","value","newTransportModes","Array","isArray","transportMode","options","find","o","combinations","array","length","fill","e1","i","filter","e2","j","SIMPLIFICATIONS","AIRPLANE","BICYCLE","BUS","CABLE_CAR","CAR","FERRY","FLEX","FUNICULAR","GONDOLA","RAIL","MONORAIL","SCOOTER","SUBWAY","TROLLEYBUS","TRAM","TRANSIT","WALK","VALID_COMBOS","BANNED_TOGETHER","TRANSIT_SUBMODES","Object","keys","TRANSIT_SUBMODES_AND_TRANSIT","isCombinationValid","combo","queryTransitSubmodes","simplifiedModes","from","Set","c","qualifier","vc","every","generateCombinations","params","completeModeList","modes","generateOtp2Query","otpQueryParams","planQuery","DefaultPlanQuery","to","otherOtpQueryParams","modeSettingValues","inverseKey","high","low","key","truthValue","falseValue","bikeReluctance","carReluctance","walkReluctance","walkSpeed","wheelchair","query","variables","fromPlace","name","lat","lon","toPlace"],"mappings":"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","sourcesContent":["import { LonLatOutput } from \"@conveyal/lonlat\";\nimport { print } from \"graphql\";\nimport {\n  ModeSetting,\n  ModeSettingValues,\n  TransportMode\n} from \"@opentripplanner/types\";\n\nimport DefaultPlanQuery from \"./planQuery.graphql\";\n\ntype InputBanned = {\n  routes?: string;\n  agencies?: string;\n  trips?: string;\n  stops?: string;\n  stopsHard?: string;\n};\n\ntype InputPreferred = {\n  routes?: string;\n  agencies?: string;\n  unpreferredCost?: string;\n};\n\ntype OTPQueryParams = {\n  arriveBy: boolean;\n  date?: string;\n  from: LonLatOutput & { name?: string };\n  modes: TransportMode[];\n  modeSettings: ModeSetting[];\n  time?: string;\n  numItineraries?: number;\n  to: LonLatOutput & { name?: string };\n  banned?: InputBanned;\n  preferred?: InputPreferred;\n  unpreferred?: InputPreferred;\n};\n\ntype GraphQLQuery = {\n  query: string;\n  variables: Record<string, unknown>;\n};\n\n/**\n * Mode Settings can contain additional modes to add to the query,\n * this function extracts those additional modes from the settings\n * and returns them in an array.\n * @param modeSettings List of mode settings with values populated\n * @returns Additional transport modes to add to query\n */\nexport function extractAdditionalModes(\n  modeSettings: ModeSetting[],\n  enabledModes: TransportMode[]\n): TransportMode[] {\n  return modeSettings.reduce<TransportMode[]>((prev, cur) => {\n    // First, ensure that the mode associated with this setting is even enabled\n    if (!enabledModes.map(m => m.mode).includes(cur.applicableMode)) {\n      return prev;\n    }\n\n    // In checkboxes, mode must be enabled and have a transport mode in it\n    if (\n      (cur.type === \"CHECKBOX\" || cur.type === \"SUBMODE\") &&\n      cur.addTransportMode &&\n      cur.value\n    ) {\n      const newTransportModes = Array.isArray(cur.addTransportMode)\n        ? cur.addTransportMode\n        : [cur.addTransportMode];\n      return [...prev, ...newTransportModes];\n    }\n    if (cur.type === \"DROPDOWN\") {\n      const transportMode = cur.options.find(o => o.value === cur.value)\n        ?.addTransportMode;\n      if (transportMode) {\n        return [...prev, transportMode];\n      }\n    }\n    return prev;\n  }, []);\n}\n\n/**\n * Generates every possible mathematical subset of the input TransportModes.\n * Uses code from:\n * https://stackoverflow.com/questions/5752002/find-all-possible-subset-combos-in-an-array\n * @param array Array of input transport modes\n * @returns 2D array representing every possible subset of transport modes from input\n */\nfunction combinations(array: TransportMode[]): TransportMode[][] {\n  if (!array) return [];\n  return (\n    // eslint-disable-next-line no-bitwise\n    new Array(1 << array.length)\n      .fill(null)\n      // eslint-disable-next-line no-bitwise\n      .map((e1, i) => array.filter((e2, j) => i & (1 << j)))\n  );\n}\n\n/**\n * This constant maps all the transport mode to a broader mode type,\n * which is used to determine the valid combinations of modes used in query generation.\n */\nexport const SIMPLIFICATIONS = {\n  AIRPLANE: \"TRANSIT\",\n  BICYCLE: \"PERSONAL\",\n  BUS: \"TRANSIT\",\n  CABLE_CAR: \"TRANSIT\",\n  CAR: \"CAR\",\n  FERRY: \"TRANSIT\",\n  FLEX: \"SHARED\", // TODO: this allows FLEX+WALK. Is this reasonable?\n  FUNICULAR: \"TRANSIT\",\n  GONDOLA: \"TRANSIT\",\n  RAIL: \"TRANSIT\",\n  MONORAIL: \"TRANSIT\",\n  SCOOTER: \"PERSONAL\",\n  SUBWAY: \"TRANSIT\",\n  TROLLEYBUS: \"TRANSIT\",\n  TRAM: \"TRANSIT\",\n  TRANSIT: \"TRANSIT\",\n  WALK: \"WALK\"\n};\n\n// Inclusion of \"TRANSIT\" alone automatically implies \"WALK\" in OTP\nconst VALID_COMBOS = [\n  [\"WALK\"],\n  [\"PERSONAL\"],\n  [\"TRANSIT\", \"SHARED\"],\n  [\"WALK\", \"SHARED\"],\n  [\"TRANSIT\"],\n  [\"TRANSIT\", \"PERSONAL\"],\n  [\"TRANSIT\", \"CAR\"]\n];\n\nconst BANNED_TOGETHER = [\"SCOOTER\", \"BICYCLE\", \"CAR\"];\n\nexport const TRANSIT_SUBMODES = Object.keys(SIMPLIFICATIONS).filter(\n  mode => SIMPLIFICATIONS[mode] === \"TRANSIT\" && mode !== \"TRANSIT\"\n);\nexport const TRANSIT_SUBMODES_AND_TRANSIT = Object.keys(SIMPLIFICATIONS).filter(\n  mode => SIMPLIFICATIONS[mode] === \"TRANSIT\"\n);\n\nfunction isCombinationValid(\n  combo: TransportMode[],\n  queryTransitSubmodes: string[]\n): boolean {\n  if (combo.length === 0) return false;\n\n  // All current qualifiers currently simplify to \"SHARED\"\n  const simplifiedModes = Array.from(\n    new Set(combo.map(c => (c.qualifier ? \"SHARED\" : SIMPLIFICATIONS[c.mode])))\n  );\n\n  // Ensure that if we have one transit mode, then we include ALL transit modes\n  if (simplifiedModes.includes(\"TRANSIT\")) {\n    // Don't allow TRANSIT along with any other submodes\n    if (queryTransitSubmodes.length && combo.find(c => c.mode === \"TRANSIT\")) {\n      return false;\n    }\n\n    if (\n      combo.reduce((prev, cur) => {\n        if (queryTransitSubmodes.includes(cur.mode)) {\n          return prev - 1;\n        }\n        return prev;\n      }, queryTransitSubmodes.length) !== 0\n    ) {\n      return false;\n    }\n    // Continue to the other checks\n  }\n\n  // OTP doesn't support multiple non-walk modes\n  if (BANNED_TOGETHER.filter(m => combo.find(c => c.mode === m)).length > 1) {\n    return false;\n  }\n\n  return !!VALID_COMBOS.find(\n    vc =>\n      simplifiedModes.length === vc.length &&\n      vc.every(m => simplifiedModes.includes(m))\n  );\n}\n\n/**\n * Generates a list of queries for OTP to get a comprehensive\n * set of results based on the modes input.\n * @param params OTP Query Params\n * @returns Set of parameters to generate queries\n */\nexport function generateCombinations(params: OTPQueryParams): OTPQueryParams[] {\n  const completeModeList = [\n    ...extractAdditionalModes(params.modeSettings, params.modes),\n    ...params.modes\n  ];\n\n  // List of the transit *submodes* that are included in the input params\n  const queryTransitSubmodes = completeModeList\n    .filter(mode => TRANSIT_SUBMODES.includes(mode.mode))\n    .map(mode => mode.mode);\n\n  return combinations(completeModeList)\n    .filter(combo => isCombinationValid(combo, queryTransitSubmodes))\n    .map(combo => ({ ...params, modes: combo }));\n}\n\n/**\n * Generates a query for OTP GraphQL API based on parameters.\n * @param param0 OTP2 Parameters for the query\n * @param planQuery Override the default query for OTP\n * @returns A fully formed query+variables ready to be sent to GraphQL backend\n */\nexport function generateOtp2Query(\n  otpQueryParams: OTPQueryParams,\n  planQuery = DefaultPlanQuery\n): GraphQLQuery {\n  const { from, modeSettings, to, ...otherOtpQueryParams } = otpQueryParams;\n\n  // This extracts the values from the mode settings to key value pairs\n  const modeSettingValues = modeSettings.reduce((prev, cur) => {\n    if (cur.type === \"SLIDER\" && cur.inverseKey) {\n      prev[cur.inverseKey] = cur.high - cur.value + cur.low;\n    }\n    prev[cur.key] = cur.value;\n\n    // If we assign a value on true, return the value (or null) instead of a boolean.\n    if (cur.type === \"CHECKBOX\" && cur.truthValue) {\n      prev[cur.key] =\n        cur.value === true ? cur.truthValue : cur.falseValue ?? null;\n    }\n    return prev;\n  }, {}) as ModeSettingValues;\n\n  const {\n    bikeReluctance,\n    carReluctance,\n    walkReluctance,\n    walkSpeed,\n    wheelchair\n  } = modeSettingValues;\n\n  return {\n    query: print(planQuery),\n    variables: {\n      ...otherOtpQueryParams,\n      bikeReluctance,\n      carReluctance,\n      fromPlace: `${from.name}::${from.lat},${from.lon}`,\n      toPlace: `${to.name}::${to.lat},${to.lon}`,\n      walkReluctance,\n      walkSpeed,\n      wheelchair\n    }\n  };\n}\n"],"file":"query-gen.js"}

package/lib/route.d.ts

@@ -32,6 +32,22 @@ export declare function getTransitOperatorFromLeg(leg: Leg, transitOperators: Tr
  * @return {object} the operator if one was found or null if no match was found
  */
 export declare function getTransitOperatorFromOtpRoute(route: Route, transitOperators: TransitOperator[]): TransitOperator;
+/**
+ * Calculates the sort comparator value given two routes based off of the
+ * route's agency and provided transitOperators config data.
+ */
+export declare function makeTransitOperatorComparator(transitOperators: TransitOperator[]): (a: Route, b: Route) => number;
+/**
+ * Calculates the sort comparator value given two routes based off of route type
+ * (OTP mode).
+ */
+export declare function routeTypeComparator(a: Route, b: Route): number;
+/**
+ * Sorts routes based off of whether the shortName begins with an alphabetic
+ * character. Routes with shortn that do start with an alphabetic character will
+ * be prioritized over those that don't.
+ */
+export declare function alphabeticShortNameComparator(a: Route, b: Route): number;
 /**
  * Checks whether an appropriate comparison of numeric values can be made for
  * sorting purposes. If both values are not valid numbers according to the
@@ -51,7 +67,7 @@ export declare function getTransitOperatorFromOtpRoute(route: Route, transitOper
  * @param  {function} [objGetterFn] An optional function to obtain the
  *  comparison value from the comparator function arguments
  */
-export declare function makeNumericValueComparator(objGetterFn?: (item: Route) => number): (a: number, b: number) => number;
+export declare function makeNumericValueComparator(objGetterFn?: (item: Route) => number): (a: number, b: number) => number | null;
 /**
  * Create a comparator function that compares string values. The comparison
  * values feed to the sort comparator function are assumed to be objects that
@@ -63,6 +79,24 @@ export declare function makeNumericValueComparator(objGetterFn?: (item: Route) =
  *  comparison value from the comparator function arguments
  */
 export declare function makeStringValueComparator(objGetterFn?: (item: Route) => string): (a: string, b: string) => number;
+/**
+ * OTP1 sets the routeSortOrder to -999 by default. If we're encountering that value in OTP1,
+ * assume that it actually means that the route sortOrder is not set in the GTFS. If we encounter
+ * it in OTP2, it's a valid value, so we should return it.
+ *
+ * See https://github.com/opentripplanner/OpenTripPlanner/issues/2938
+ * Also see https://github.com/opentripplanner/otp-react-redux/issues/122
+ * This was updated in OTP2 TO be empty by default. https://docs.opentripplanner.org/en/v2.3.0/OTP2-MigrationGuide/#:~:text=the%20Alerts-,Changes%20to%20the%20Index%20API,-Error%20handling%20is
+ */
+export declare function getRouteSortOrderValue(route: Route): number;
+/**
+ * Create a multi-criteria sort comparator function composed of other sort
+ * comparator functions. Each comparator function will be ran in the order given
+ * until a non-zero comparison value is obtained which is then immediately
+ * returned. If all comparison functions return equivalence, then the values
+ * are assumed to be equivalent.
+ */
+export declare function makeMultiCriteriaSort(...criteria: ((a: unknown, b: unknown) => number)[]): (a: number, b: number) => number;
 /**
  * Creates a sort comparator function to compares routes for the purposes of
  * sorting and displaying in a user interface. This takes in a single optional

package/lib/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../src/route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAErE;;;;;;;;;;;GAWG;AACH,wBAAgB,uCAAuC,CACrD,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,gBAAgB,EAAE,eAAe,EAAE,GAClC,eAAe,CAQjB;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,GAAG,EACR,gBAAgB,EAAE,eAAe,EAAE,GAClC,eAAe,CAQjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,eAAe,EAAE,GAClC,eAAe,CAkBjB;AA4MD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,OAI1B,MAAM,KAAK,MAAM,KAAG,MAAM,CAatC;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,OAE1B,MAAM,KAAK,MAAM,KAAG,MAAM,CAatC;AAqCD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,mBAAmB,CACjC,gBAAgB,EAAE,eAAe,EAAE,GAClC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CAUlC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACtC,eAAe,EAAE,MAAM,EACvB,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,CA2BR"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../src/route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAErE;;;;;;;;;;;GAWG;AACH,wBAAgB,uCAAuC,CACrD,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,gBAAgB,EAAE,eAAe,EAAE,GAClC,eAAe,CAQjB;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,GAAG,EACR,gBAAgB,EAAE,eAAe,EAAE,GAClC,eAAe,CAQjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,eAAe,EAAE,GAClC,eAAe,CAkBjB;AA0DD;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE,eAAe,EAAE,OAExB,KAAK,KAAK,KAAK,YAc3B;AA8ED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAE9D;AAiBD;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAmBxE;AAUD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,OAE1B,MAAM,KAAK,MAAM,KAAG,MAAM,GAAG,IAAI,CAiB7C;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,OAE1B,MAAM,KAAK,MAAM,KAAG,MAAM,CAatC;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAS3D;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC,EAAE,OAExC,MAAM,KAAK,MAAM,KAAG,MAAM,CAWtC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,mBAAmB,CACjC,gBAAgB,EAAE,eAAe,EAAE,GAClC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CAUlC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACtC,eAAe,EAAE,MAAM,EACvB,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,CA2BR"}