@opentripplanner/core-utils 11.4.2-mobility-profile → 11.4.3-mobility-profile

package/lib/index.d.ts

@@ -5,6 +5,7 @@ import * as storage from "./storage";
 import * as time from "./time";
 import * as ui from "./ui";
 import * as queryGen from "./query-gen";
+import SafeSuspense from "./suspense";
 declare const core: {
     itinerary: typeof itinerary;
     map: typeof map;
@@ -17,5 +18,6 @@ declare const core: {
     time: typeof time;
     ui: typeof ui;
 };
+export { SafeSuspense };
 export default core;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAI7B,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,EAAE,MAAM,MAAM,CAAC;AAC3B,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAC;AAExC,QAAA,MAAM,IAAI;;;;;;;;;;;CAWT,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAI7B,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,EAAE,MAAM,MAAM,CAAC;AAC3B,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAC;AACxC,OAAO,YAAY,MAAM,YAAY,CAAC;AAEtC,QAAA,MAAM,IAAI;;;;;;;;;;;CAWT,CAAC;AAEF,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,eAAe,IAAI,CAAC"}

package/lib/index.js

@@ -1,8 +1,16 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "SafeSuspense", {
+  enumerable: true,
+  get: function () {
+    return _suspense.default;
+  }
+});
 exports.default = void 0;
 
 var itinerary = _interopRequireWildcard(require("./itinerary"));
@@ -25,6 +33,8 @@ var ui = _interopRequireWildcard(require("./ui"));
 
 var queryGen = _interopRequireWildcard(require("./query-gen"));
 
+var _suspense = _interopRequireDefault(require("./suspense"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["core","itinerary","map","profile","query","queryGen","queryParams","route","storage","time","ui"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAEA,MAAMA,IAAI,GAAG;AACXC,EAAAA,SADW;AAEXC,EAAAA,GAFW;AAGXC,EAAAA,OAHW;AAIXC,EAAAA,KAJW;AAKXC,EAAAA,QALW;AAMXC,EAAAA,WANW;AAOXC,EAAAA,KAPW;AAQXC,EAAAA,OARW;AASXC,EAAAA,IATW;AAUXC,EAAAA;AAVW,CAAb;eAaeV,I","sourcesContent":["import * as itinerary from \"./itinerary\";\nimport * as map from \"./map\";\nimport * as profile from \"./profile\";\nimport * as query from \"./query\";\nimport * as queryParams from \"./query-params\";\nimport * as route from \"./route\";\nimport * as storage from \"./storage\";\nimport * as time from \"./time\";\nimport * as ui from \"./ui\";\nimport * as queryGen from \"./query-gen\";\n\nconst core = {\n  itinerary,\n  map,\n  profile,\n  query,\n  queryGen,\n  queryParams,\n  route,\n  storage,\n  time,\n  ui\n};\n\nexport default core;\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.ts"],"names":["core","itinerary","map","profile","query","queryGen","queryParams","route","storage","time","ui"],"mappings":";;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAEA,MAAMA,IAAI,GAAG;AACXC,EAAAA,SADW;AAEXC,EAAAA,GAFW;AAGXC,EAAAA,OAHW;AAIXC,EAAAA,KAJW;AAKXC,EAAAA,QALW;AAMXC,EAAAA,WANW;AAOXC,EAAAA,KAPW;AAQXC,EAAAA,OARW;AASXC,EAAAA,IATW;AAUXC,EAAAA;AAVW,CAAb;eAceV,I","sourcesContent":["import * as itinerary from \"./itinerary\";\nimport * as map from \"./map\";\nimport * as profile from \"./profile\";\nimport * as query from \"./query\";\nimport * as queryParams from \"./query-params\";\nimport * as route from \"./route\";\nimport * as storage from \"./storage\";\nimport * as time from \"./time\";\nimport * as ui from \"./ui\";\nimport * as queryGen from \"./query-gen\";\nimport SafeSuspense from \"./suspense\";\n\nconst core = {\n  itinerary,\n  map,\n  profile,\n  query,\n  queryGen,\n  queryParams,\n  route,\n  storage,\n  time,\n  ui\n};\n\nexport { SafeSuspense };\nexport default core;\n"],"file":"index.js"}

package/lib/otpSchema.json

@@ -7662,6 +7662,16 @@
                     "ofType": null
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "mobilityProfile",
+                  "description": "Preferences for routing based on mobility profile",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {

package/lib/planQuery.graphql

@@ -5,6 +5,7 @@ query Plan(
   $carReluctance: Float
   $date: String
   $fromPlace: String!
+  $mobilityProfile: String
   $modes: [TransportMode]
   $numItineraries: Int
   $preferred: InputPreferred
@@ -24,6 +25,7 @@ query Plan(
     fromPlace: $fromPlace
     # Currently only supporting EN locale, used for times and text
     locale: "en"
+    mobilityProfile: $mobilityProfile
     numItineraries: $numItineraries
     preferred: $preferred
     time: $time

package/lib/query-gen.js

@@ -195,13 +195,13 @@ function generateOtp2Query({
       bikeReluctance,
       carReluctance,
       date,
-      fromPlace: `${from.name}::${from.lat},${from.lon}}`,
+      fromPlace: `${from.name}::${from.lat},${from.lon}`,
       mobilityProfile,
       modes,
       numItineraries,
       preferred,
       time,
-      toPlace: `${to.name}::${to.lat},${to.lon}}`,
+      toPlace: `${to.name}::${to.lat},${to.lon}`,
       unpreferred,
       walkReluctance,
       walkSpeed,

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","arriveBy","banned","date","mobilityProfile","numItineraries","preferred","time","to","unpreferred","planQuery","DefaultPlanQuery","modeSettingValues","inverseKey","high","low","key","truthValue","falseValue","bikeReluctance","carReluctance","walkSpeed","walkReluctance","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  mobilityProfile?: 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  {\n    arriveBy,\n    banned,\n    date,\n    from,\n    mobilityProfile,\n    modes,\n    modeSettings,\n    numItineraries,\n    preferred,\n    time,\n    to,\n    unpreferred\n  }: OTPQueryParams,\n  planQuery = DefaultPlanQuery\n): GraphQLQuery {\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    walkSpeed,\n    walkReluctance,\n    wheelchair\n  } = modeSettingValues;\n\n  return {\n    query: print(planQuery),\n    variables: {\n      arriveBy,\n      banned,\n      bikeReluctance,\n      carReluctance,\n      date,\n      fromPlace: `${from.name}::${from.lat},${from.lon}}`,\n      mobilityProfile,\n      modes,\n      numItineraries,\n      preferred,\n      time,\n      toPlace: `${to.name}::${to.lat},${to.lon}}`,\n      unpreferred,\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","arriveBy","banned","date","mobilityProfile","numItineraries","preferred","time","to","unpreferred","planQuery","DefaultPlanQuery","modeSettingValues","inverseKey","high","low","key","truthValue","falseValue","bikeReluctance","carReluctance","walkSpeed","walkReluctance","wheelchair","query","variables","fromPlace","name","lat","lon","toPlace"],"mappings":";;;;;;;;;;AACA;;;;AA2CA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,sBAAT,CACLC,YADK,EAELC,YAFK,EAGY;AACjB,SAAOD,YAAY,CAACE,MAAb,CAAqC,CAACC,IAAD,EAAOC,GAAP,KAAe;AACzD;AACA,QAAI,CAACH,YAAY,CAACI,GAAb,CAAiBC,CAAC,IAAIA,CAAC,CAACC,IAAxB,EAA8BC,QAA9B,CAAuCJ,GAAG,CAACK,cAA3C,CAAL,EAAiE;AAC/D,aAAON,IAAP;AACD,KAJwD,CAMzD;;;AACA,QACE,CAACC,GAAG,CAACM,IAAJ,KAAa,UAAb,IAA2BN,GAAG,CAACM,IAAJ,KAAa,SAAzC,KACAN,GAAG,CAACO,gBADJ,IAEAP,GAAG,CAACQ,KAHN,EAIE;AACA,YAAMC,iBAAiB,GAAGC,KAAK,CAACC,OAAN,CAAcX,GAAG,CAACO,gBAAlB,IACtBP,GAAG,CAACO,gBADkB,GAEtB,CAACP,GAAG,CAACO,gBAAL,CAFJ;AAGA,aAAO,CAAC,GAAGR,IAAJ,EAAU,GAAGU,iBAAb,CAAP;AACD;;AACD,QAAIT,GAAG,CAACM,IAAJ,KAAa,UAAjB,EAA6B;AAAA;;AAC3B,YAAMM,aAAa,wBAAGZ,GAAG,CAACa,OAAJ,CAAYC,IAAZ,CAAiBC,CAAC,IAAIA,CAAC,CAACP,KAAF,KAAYR,GAAG,CAACQ,KAAtC,CAAH,sDAAG,kBAClBD,gBADJ;;AAEA,UAAIK,aAAJ,EAAmB;AACjB,eAAO,CAAC,GAAGb,IAAJ,EAAUa,aAAV,CAAP;AACD;AACF;;AACD,WAAOb,IAAP;AACD,GAzBM,EAyBJ,EAzBI,CAAP;AA0BD;AAED;AACA;AACA;AACA;AACA;AACA;AACA;;;AACA,SAASiB,YAAT,CAAsBC,KAAtB,EAAiE;AAC/D,MAAI,CAACA,KAAL,EAAY,OAAO,EAAP;AACZ,SACE;AACA,QAAIP,KAAJ,CAAU,KAAKO,KAAK,CAACC,MAArB,EACGC,IADH,CACQ,IADR,EAEE;AAFF,KAGGlB,GAHH,CAGO,CAACmB,EAAD,EAAKC,CAAL,KAAWJ,KAAK,CAACK,MAAN,CAAa,CAACC,EAAD,EAAKC,CAAL,KAAWH,CAAC,GAAI,KAAKG,CAAlC,CAHlB;AAFF;AAOD;AAED;AACA;AACA;AACA;;;AACO,MAAMC,eAAe,GAAG;AAC7BC,EAAAA,QAAQ,EAAE,SADmB;AAE7BC,EAAAA,OAAO,EAAE,UAFoB;AAG7BC,EAAAA,GAAG,EAAE,SAHwB;AAI7BC,EAAAA,SAAS,EAAE,SAJkB;AAK7BC,EAAAA,GAAG,EAAE,KALwB;AAM7BC,EAAAA,KAAK,EAAE,SANsB;AAO7BC,EAAAA,IAAI,EAAE,QAPuB;AAOb;AAChBC,EAAAA,SAAS,EAAE,SARkB;AAS7BC,EAAAA,OAAO,EAAE,SAToB;AAU7BC,EAAAA,IAAI,EAAE,SAVuB;AAW7BC,EAAAA,QAAQ,EAAE,SAXmB;AAY7BC,EAAAA,OAAO,EAAE,UAZoB;AAa7BC,EAAAA,MAAM,EAAE,SAbqB;AAc7BC,EAAAA,UAAU,EAAE,SAdiB;AAe7BC,EAAAA,IAAI,EAAE,SAfuB;AAgB7BC,EAAAA,OAAO,EAAE,SAhBoB;AAiB7BC,EAAAA,IAAI,EAAE;AAjBuB,CAAxB,C,CAoBP;;;AACA,MAAMC,YAAY,GAAG,CACnB,CAAC,MAAD,CADmB,EAEnB,CAAC,UAAD,CAFmB,EAGnB,CAAC,SAAD,EAAY,QAAZ,CAHmB,EAInB,CAAC,MAAD,EAAS,QAAT,CAJmB,EAKnB,CAAC,SAAD,CALmB,EAMnB,CAAC,SAAD,EAAY,UAAZ,CANmB,EAOnB,CAAC,SAAD,EAAY,KAAZ,CAPmB,CAArB;AAUA,MAAMC,eAAe,GAAG,CAAC,SAAD,EAAY,SAAZ,EAAuB,KAAvB,CAAxB;AAEO,MAAMC,gBAAgB,GAAGC,MAAM,CAACC,IAAP,CAAYtB,eAAZ,EAA6BH,MAA7B,CAC9BnB,IAAI,IAAIsB,eAAe,CAACtB,IAAD,CAAf,KAA0B,SAA1B,IAAuCA,IAAI,KAAK,SAD1B,CAAzB;;AAGA,MAAM6C,4BAA4B,GAAGF,MAAM,CAACC,IAAP,CAAYtB,eAAZ,EAA6BH,MAA7B,CAC1CnB,IAAI,IAAIsB,eAAe,CAACtB,IAAD,CAAf,KAA0B,SADQ,CAArC;;;AAIP,SAAS8C,kBAAT,CACEC,KADF,EAEEC,oBAFF,EAGW;AACT,MAAID,KAAK,CAAChC,MAAN,KAAiB,CAArB,EAAwB,OAAO,KAAP,CADf,CAGT;;AACA,QAAMkC,eAAe,GAAG1C,KAAK,CAAC2C,IAAN,CACtB,IAAIC,GAAJ,CAAQJ,KAAK,CAACjD,GAAN,CAAUsD,CAAC,IAAKA,CAAC,CAACC,SAAF,GAAc,QAAd,GAAyB/B,eAAe,CAAC8B,CAAC,CAACpD,IAAH,CAAxD,CAAR,CADsB,CAAxB,CAJS,CAQT;;AACA,MAAIiD,eAAe,CAAChD,QAAhB,CAAyB,SAAzB,CAAJ,EAAyC;AACvC;AACA,QAAI+C,oBAAoB,CAACjC,MAArB,IAA+BgC,KAAK,CAACpC,IAAN,CAAWyC,CAAC,IAAIA,CAAC,CAACpD,IAAF,KAAW,SAA3B,CAAnC,EAA0E;AACxE,aAAO,KAAP;AACD;;AAED,QACE+C,KAAK,CAACpD,MAAN,CAAa,CAACC,IAAD,EAAOC,GAAP,KAAe;AAC1B,UAAImD,oBAAoB,CAAC/C,QAArB,CAA8BJ,GAAG,CAACG,IAAlC,CAAJ,EAA6C;AAC3C,eAAOJ,IAAI,GAAG,CAAd;AACD;;AACD,aAAOA,IAAP;AACD,KALD,EAKGoD,oBAAoB,CAACjC,MALxB,MAKoC,CANtC,EAOE;AACA,aAAO,KAAP;AACD,KAfsC,CAgBvC;;AACD,GA1BQ,CA4BT;;;AACA,MAAI0B,eAAe,CAACtB,MAAhB,CAAuBpB,CAAC,IAAIgD,KAAK,CAACpC,IAAN,CAAWyC,CAAC,IAAIA,CAAC,CAACpD,IAAF,KAAWD,CAA3B,CAA5B,EAA2DgB,MAA3D,GAAoE,CAAxE,EAA2E;AACzE,WAAO,KAAP;AACD;;AAED,SAAO,CAAC,CAACyB,YAAY,CAAC7B,IAAb,CACP2C,EAAE,IACAL,eAAe,CAACM,KAAhB,CAAsBxD,CAAC,IAAIuD,EAAE,CAACrD,QAAH,CAAYF,CAAZ,CAA3B,KACAuD,EAAE,CAACC,KAAH,CAASxD,CAAC,IAAIkD,eAAe,CAAChD,QAAhB,CAAyBF,CAAzB,CAAd,CAHK,CAAT;AAKD;AAED;AACA;AACA;AACA;AACA;AACA;;;AACO,SAASyD,oBAAT,CAA8BC,MAA9B,EAAwE;AAC7E,QAAMC,gBAAgB,GAAG,CACvB,GAAGlE,sBAAsB,CAACiE,MAAM,CAAChE,YAAR,EAAsBgE,MAAM,CAACE,KAA7B,CADF,EAEvB,GAAGF,MAAM,CAACE,KAFa,CAAzB,CAD6E,CAM7E;;AACA,QAAMX,oBAAoB,GAAGU,gBAAgB,CAC1CvC,MAD0B,CACnBnB,IAAI,IAAI0C,gBAAgB,CAACzC,QAAjB,CAA0BD,IAAI,CAACA,IAA/B,CADW,EAE1BF,GAF0B,CAEtBE,IAAI,IAAIA,IAAI,CAACA,IAFS,CAA7B;AAIA,SAAOa,YAAY,CAAC6C,gBAAD,CAAZ,CACJvC,MADI,CACG4B,KAAK,IAAID,kBAAkB,CAACC,KAAD,EAAQC,oBAAR,CAD9B,EAEJlD,GAFI,CAEAiD,KAAK,KAAK,EAAE,GAAGU,MAAL;AAAaE,IAAAA,KAAK,EAAEZ;AAApB,GAAL,CAFL,CAAP;AAGD;AAED;AACA;AACA;AACA;AACA;AACA;;;AACO,SAASa,iBAAT,CACL;AACEC,EAAAA,QADF;AAEEC,EAAAA,MAFF;AAGEC,EAAAA,IAHF;AAIEb,EAAAA,IAJF;AAKEc,EAAAA,eALF;AAMEL,EAAAA,KANF;AAOElE,EAAAA,YAPF;AAQEwE,EAAAA,cARF;AASEC,EAAAA,SATF;AAUEC,EAAAA,IAVF;AAWEC,EAAAA,EAXF;AAYEC,EAAAA;AAZF,CADK,EAeLC,SAAS,GAAGC,gBAfP,EAgBS;AACd;AACA,QAAMC,iBAAiB,GAAG/E,YAAY,CAACE,MAAb,CAAoB,CAACC,IAAD,EAAOC,GAAP,KAAe;AAC3D,QAAIA,GAAG,CAACM,IAAJ,KAAa,QAAb,IAAyBN,GAAG,CAAC4E,UAAjC,EAA6C;AAC3C7E,MAAAA,IAAI,CAACC,GAAG,CAAC4E,UAAL,CAAJ,GAAuB5E,GAAG,CAAC6E,IAAJ,GAAW7E,GAAG,CAACQ,KAAf,GAAuBR,GAAG,CAAC8E,GAAlD;AACD;;AACD/E,IAAAA,IAAI,CAACC,GAAG,CAAC+E,GAAL,CAAJ,GAAgB/E,GAAG,CAACQ,KAApB,CAJ2D,CAM3D;;AACA,QAAIR,GAAG,CAACM,IAAJ,KAAa,UAAb,IAA2BN,GAAG,CAACgF,UAAnC,EAA+C;AAAA;;AAC7CjF,MAAAA,IAAI,CAACC,GAAG,CAAC+E,GAAL,CAAJ,GACE/E,GAAG,CAACQ,KAAJ,KAAc,IAAd,GAAqBR,GAAG,CAACgF,UAAzB,sBAAsChF,GAAG,CAACiF,UAA1C,6DAAwD,IAD1D;AAED;;AACD,WAAOlF,IAAP;AACD,GAZyB,EAYvB,EAZuB,CAA1B;AAcA,QAAM;AACJmF,IAAAA,cADI;AAEJC,IAAAA,aAFI;AAGJC,IAAAA,SAHI;AAIJC,IAAAA,cAJI;AAKJC,IAAAA;AALI,MAMFX,iBANJ;AAQA,SAAO;AACLY,IAAAA,KAAK,EAAE,oBAAMd,SAAN,CADF;AAELe,IAAAA,SAAS,EAAE;AACTxB,MAAAA,QADS;AAETC,MAAAA,MAFS;AAGTiB,MAAAA,cAHS;AAITC,MAAAA,aAJS;AAKTjB,MAAAA,IALS;AAMTuB,MAAAA,SAAS,EAAG,GAAEpC,IAAI,CAACqC,IAAK,KAAIrC,IAAI,CAACsC,GAAI,IAAGtC,IAAI,CAACuC,GAAI,EANxC;AAOTzB,MAAAA,eAPS;AAQTL,MAAAA,KARS;AASTM,MAAAA,cATS;AAUTC,MAAAA,SAVS;AAWTC,MAAAA,IAXS;AAYTuB,MAAAA,OAAO,EAAG,GAAEtB,EAAE,CAACmB,IAAK,KAAInB,EAAE,CAACoB,GAAI,IAAGpB,EAAE,CAACqB,GAAI,EAZhC;AAaTpB,MAAAA,WAbS;AAcTa,MAAAA,cAdS;AAeTD,MAAAA,SAfS;AAgBTE,MAAAA;AAhBS;AAFN,GAAP;AAqBD","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  mobilityProfile?: 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  {\n    arriveBy,\n    banned,\n    date,\n    from,\n    mobilityProfile,\n    modes,\n    modeSettings,\n    numItineraries,\n    preferred,\n    time,\n    to,\n    unpreferred\n  }: OTPQueryParams,\n  planQuery = DefaultPlanQuery\n): GraphQLQuery {\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    walkSpeed,\n    walkReluctance,\n    wheelchair\n  } = modeSettingValues;\n\n  return {\n    query: print(planQuery),\n    variables: {\n      arriveBy,\n      banned,\n      bikeReluctance,\n      carReluctance,\n      date,\n      fromPlace: `${from.name}::${from.lat},${from.lon}`,\n      mobilityProfile,\n      modes,\n      numItineraries,\n      preferred,\n      time,\n      toPlace: `${to.name}::${to.lat},${to.lon}`,\n      unpreferred,\n      walkReluctance,\n      walkSpeed,\n      wheelchair\n    }\n  };\n}\n"],"file":"query-gen.js"}

package/lib/suspense.d.ts

@@ -0,0 +1,8 @@
+import { ReactElement, ReactNode } from "react";
+declare type Props = {
+    children: ReactNode;
+    fallback: ReactNode;
+};
+declare const SafeSuspense: ({ children, fallback }: Props) => ReactElement;
+export default SafeSuspense;
+//# sourceMappingURL=suspense.d.ts.map

package/lib/suspense.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"suspense.d.ts","sourceRoot":"","sources":["../src/suspense.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,YAAY,EAAE,SAAS,EAAY,MAAM,OAAO,CAAC;AAEjE,aAAK,KAAK,GAAG;IACX,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF,QAAA,MAAM,YAAY,2BAA4B,KAAK,KAAG,YASrD,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/core-utils",
-  "version": "11.4.2-mobility-profile",
+  "version": "11.4.3-mobility-profile",
   "description": "Core functionality that is shared among numerous UI components",
   "engines": {
     "node": ">=13"

package/src/index.ts

@@ -8,6 +8,7 @@ import * as storage from "./storage";
 import * as time from "./time";
 import * as ui from "./ui";
 import * as queryGen from "./query-gen";
+import SafeSuspense from "./suspense";
 
 const core = {
   itinerary,
@@ -22,4 +23,5 @@ const core = {
   ui
 };
 
+export { SafeSuspense };
 export default core;

package/src/query-gen.ts

@@ -262,13 +262,13 @@ export function generateOtp2Query(
       bikeReluctance,
       carReluctance,
       date,
-      fromPlace: `${from.name}::${from.lat},${from.lon}}`,
+      fromPlace: `${from.name}::${from.lat},${from.lon}`,
       mobilityProfile,
       modes,
       numItineraries,
       preferred,
       time,
-      toPlace: `${to.name}::${to.lat},${to.lon}}`,
+      toPlace: `${to.name}::${to.lat},${to.lon}`,
       unpreferred,
       walkReluctance,
       walkSpeed,

package/src/suspense.tsx

@@ -0,0 +1,19 @@
+import React, { ReactElement, ReactNode, Suspense } from "react";
+
+type Props = {
+  children: ReactNode;
+  fallback: ReactNode;
+};
+
+const SafeSuspense = ({ children, fallback }: Props): ReactElement => {
+  const IS_TEST_RUNNER = window.navigator.userAgent.match(
+    /StorybookTestRunner/
+  );
+  return IS_TEST_RUNNER ? (
+    <>{fallback}</>
+  ) : (
+    <Suspense fallback={fallback}>{children}</Suspense>
+  );
+};
+
+export default SafeSuspense;

package/tsconfig.json

@@ -8,6 +8,5 @@
     "lib": ["es2019", "dom"],
     "skipLibCheck": true
   },
-  "include": ["src/**/*"],
-  "exclude": ["src/__tests__/**/*"]
+  "include": ["src/**/*"]
 }