@opentripplanner/core-utils 12.0.0-alpha.8 → 12.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/__tests__/__mocks__/bike-rental-itinerary.json +863 -0
- package/esm/__tests__/__mocks__/config.json +54 -0
- package/esm/__tests__/__mocks__/fare-products-itinerary.json +1299 -0
- package/esm/__tests__/__mocks__/routes.json +107 -0
- package/esm/__tests__/__mocks__/tnc-itinerary.json +1726 -0
- package/esm/bike-rental-itinerary.json +863 -0
- package/esm/config.json +54 -0
- package/esm/fare-products-itinerary.json +1299 -0
- package/esm/index.js +2 -0
- package/esm/index.js.map +1 -1
- package/esm/itinerary.js +46 -21
- package/esm/itinerary.js.map +1 -1
- package/esm/otpSchema.json +13373 -0
- package/esm/planQuery.graphql +281 -0
- package/esm/profile.js +1 -1
- package/esm/profile.js.map +1 -1
- package/esm/query-gen.js +8 -5
- package/esm/query-gen.js.map +1 -1
- package/esm/query.js +1 -5
- package/esm/query.js.map +1 -1
- package/esm/routes.json +107 -0
- package/esm/storage.js +2 -6
- package/esm/storage.js.map +1 -1
- package/esm/suspense.js +13 -0
- package/esm/suspense.js.map +1 -0
- package/esm/tnc-itinerary.json +1726 -0
- package/lib/__tests__/__mocks__/bike-rental-itinerary.json +863 -0
- package/lib/__tests__/__mocks__/config.json +54 -0
- package/lib/__tests__/__mocks__/fare-products-itinerary.json +1299 -0
- package/lib/__tests__/__mocks__/routes.json +107 -0
- package/lib/__tests__/__mocks__/tnc-itinerary.json +1726 -0
- package/lib/index.d.ts +2 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +10 -0
- package/lib/index.js.map +1 -1
- package/lib/itinerary.d.ts +13 -4
- package/lib/itinerary.d.ts.map +1 -1
- package/lib/itinerary.js +59 -22
- package/lib/itinerary.js.map +1 -1
- package/lib/otpSchema.json +13373 -0
- package/lib/planQuery.graphql +281 -0
- package/lib/profile.js +1 -1
- package/lib/profile.js.map +1 -1
- package/lib/query-gen.d.ts +3 -1
- package/lib/query-gen.d.ts.map +1 -1
- package/lib/query-gen.js +8 -5
- package/lib/query-gen.js.map +1 -1
- package/lib/query.js +1 -5
- package/lib/query.js.map +1 -1
- package/lib/storage.d.ts.map +1 -1
- package/lib/storage.js +2 -6
- package/lib/storage.js.map +1 -1
- package/lib/suspense.d.ts +8 -0
- package/lib/suspense.d.ts.map +1 -0
- package/lib/suspense.js +26 -0
- package/lib/suspense.js.map +1 -0
- package/package.json +3 -3
- package/src/__tests__/itinerary.ts +36 -1
- package/src/core-utils.story.tsx +1 -1
- package/src/index.ts +2 -0
- package/src/itinerary.ts +68 -26
- package/src/otpSchema.json +0 -12
- package/src/planQuery.graphql +27 -0
- package/src/profile.js +1 -1
- package/src/query-gen.ts +8 -4
- package/src/query.js +1 -4
- package/src/storage.ts +5 -9
- package/src/suspense.tsx +19 -0
- package/tsconfig.json +1 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/lib/core-utils.story.d.ts +0 -22
- package/lib/core-utils.story.d.ts.map +0 -1
- package/lib/core-utils.story.js +0 -69
- package/lib/core-utils.story.js.map +0 -1
package/lib/query-gen.js.map
CHANGED
|
@@ -1 +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","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","numItineraries","preferred","time","to","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 modes: TransportMode[];\n modeSettings: ModeSetting[];\n time?: string;\n numItineraries?: number;\n to: LonLatOutput & { name?: string };\n banned?: InputBanned;\n preferred?: 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 (or submode 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 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 modes,\n modeSettings,\n numItineraries,\n preferred,\n time,\n to\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 modes,\n numItineraries,\n preferred,\n time,\n toPlace: `${to.name}::${to.lat},${to.lon}}`,\n walkReluctance,\n walkSpeed,\n wheelchair\n }\n };\n}\n"],"file":"query-gen.js"}
|
|
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","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 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 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 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/query.js
CHANGED
|
@@ -64,11 +64,7 @@ function ensureSingleAccessMode(queryModes) {
|
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
function getUrlParams() {
|
|
67
|
-
|
|
68
|
-
return _qs.default.parse(window.location.href.split("?")[1]);
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
return undefined;
|
|
67
|
+
return _qs.default.parse(window.location.href.split("?")[1]);
|
|
72
68
|
}
|
|
73
69
|
|
|
74
70
|
function getOtpUrlParams() {
|
package/lib/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/query.js"],"names":["defaultParams","TIME_FORMATS","getQueryParamProperty","paramInfo","property","query","ensureSingleAccessMode","queryModes","accessCount","filter","m","length","firstAccess","find","push","getUrlParams","window","qs","parse","location","href","split","undefined","getOtpUrlParams","Object","keys","key","startsWith","getTripOptionsFromQuery","keepPlace","options","time","departArrive","date","from","to","getDefaultQueryParamValue","param","default","getDefaultQuery","config","defaultQuery","routingType","queryParams","qp","forEach","name","routingTypes","defaultQueryParams","isParamApplicable","applicable","includes","reduceOtpFlexModes","modes","enabled","reduce","prev","cur","newModes","expandOtpFlexMode","mode","map","join","isNotDefaultQuery","activeModes","sort","mergeFlex","defaultModes","concat","modesEqual","every","value","index","i","getFirstGeocodeResult","text","geocoderConfig","geocoder","search","then","result","firstResult","features","getLocationFromGeocodedFeature","parseLocationString","parts","coordinates","lat","lon","queryParamToLocation","planParamsToQuery","params","fromPlace","toPlace","arriveBy","matchedTimeFormat","timeFormat","Date","OTP_API_TIME_FORMAT","intermediatePlaces","maybeNumber","Number","isNaN","planParamsToQueryAsync","getRoutingParams","currentQuery","ignoreRealtimeUpdates","isItinerary","indexOf","rewriteFunction","itineraryRewrite","profileRewrite","assign","dateValid","OTP_API_DATE_FORMAT","timeValid","minTransitDistance","searchTimeout","onlyTransitTrips","startTimeValid","startTime","endTimeValid","endTime","reducedMode"],"mappings":"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","sourcesContent":["import { format, isMatch, parse } from \"date-fns\";\nimport getGeocoder from \"@opentripplanner/geocoder/lib\";\nimport qs from \"qs\";\n\nimport { getTransitModes, hasCar, isAccessMode } from \"./itinerary\";\nimport { coordsToString, stringToCoords } from \"./map\";\nimport queryParams from \"./query-params\";\nimport {\n getCurrentTime,\n getCurrentDate,\n OTP_API_DATE_FORMAT,\n OTP_API_TIME_FORMAT\n} from \"./time\";\n\n/* The list of default parameters considered in the settings panel */\n\nexport const defaultParams = [\n \"wheelchair\",\n \"maxWalkDistance\",\n \"walkReluctance\",\n \"maxWalkTime\",\n \"maxBikeDistance\",\n \"maxBikeTime\",\n \"bikeSpeed\",\n \"optimize\",\n \"optimizeBike\",\n \"maxEScooterDistance\",\n \"watts\"\n];\n\n/**\n * List of time formats to parse when reading query params.\n */\nconst TIME_FORMATS = [\n \"HH:mm:ss\",\n \"HH:mm\",\n \"H:mm\",\n \"h:mm:ss a\",\n \"h:mm:ssa\",\n \"h:mm a\",\n \"h:mma\",\n \"h:mm\",\n \"HHmm\",\n \"hmm\",\n \"ha\"\n];\n\n/* A function to retrieve a property value from an entry in the query-params\n * table, checking for either a static value or a function */\n\nexport function getQueryParamProperty(paramInfo, property, query) {\n return typeof paramInfo[property] === \"function\"\n ? paramInfo[property](query)\n : paramInfo[property];\n}\n\nexport function ensureSingleAccessMode(queryModes) {\n // Count the number of access modes\n const accessCount = queryModes.filter(m => isAccessMode(m)).length;\n\n // If multiple access modes are specified, keep only the first one\n if (accessCount > 1) {\n const firstAccess = queryModes.find(m => isAccessMode(m));\n queryModes = queryModes.filter(m => !isAccessMode(m) || m === firstAccess);\n\n // If no access modes are specified, add 'WALK' as the default\n } else if (accessCount === 0) {\n queryModes.push(\"WALK\");\n }\n\n return queryModes;\n}\n\nexport function getUrlParams() {\n if (window) {\n return qs.parse(window.location.href.split(\"?\")[1]);\n }\n return undefined;\n}\n\nexport function getOtpUrlParams() {\n return Object.keys(getUrlParams()).filter(key => !key.startsWith(\"ui_\"));\n}\n\nexport function getTripOptionsFromQuery(query, keepPlace = false) {\n const options = { ...query };\n // Delete time/date options and from/to\n delete options.time;\n delete options.departArrive;\n delete options.date;\n if (!keepPlace) {\n delete options.from;\n delete options.to;\n }\n return options;\n}\n\n/**\n * Gets the query param's default value that is either a constant or by\n * executing the default value function.\n */\nfunction getDefaultQueryParamValue(param) {\n return typeof param.default === \"function\" ? param.default() : param.default;\n}\n\n/**\n * Get the default query to OTP based on the given config.\n */\nexport function getDefaultQuery(config = null) {\n const defaultQuery = { routingType: \"ITINERARY\" };\n queryParams\n .filter(qp => \"default\" in qp)\n .forEach(qp => {\n defaultQuery[qp.name] = getDefaultQueryParamValue(qp);\n });\n if (config) {\n if (config.routingTypes && config.routingTypes.length > 0) {\n defaultQuery.routingType = config.routingTypes[0].key;\n }\n if (config.defaultQueryParams) {\n Object.keys(config.defaultQueryParams).forEach(key => {\n defaultQuery[key] = config.defaultQueryParams[key];\n });\n }\n }\n return defaultQuery;\n}\n\n/**\n * Determine if the specified query param applies to the given query (based on\n * routing type and the param's own applicable function).\n * @param paramInfo an entry from query-params.js\n * @param query the query against which to check if the param applies\n * @param config OTP config\n * @return {Boolean}\n */\nfunction isParamApplicable(paramInfo, query, config) {\n const { applicable, routingTypes } = paramInfo;\n if (!routingTypes.includes(query.routingType)) return false;\n if (typeof applicable === \"function\" && !applicable(query, config)) {\n return false;\n }\n return true;\n}\n\n/**\n * Helper method which replaces OTP flex modes with single FLEX mode that's\n * more useful and easier to work with.\n */\nexport function reduceOtpFlexModes(modes, enabled = true) {\n if (!enabled) return modes;\n\n return modes.reduce((prev, cur) => {\n const newModes = prev;\n // Add the current mode if it is not a flex mode\n if (!cur.includes(\"FLEX\")) {\n newModes.push(cur);\n // If it is a flex mode, do not add it but rather add the custom flex mode\n // if not already present\n } else if (!newModes.includes(\"FLEX\")) {\n newModes.push(\"FLEX\");\n }\n return newModes;\n }, []);\n}\n\n/**\n * Helper method to process a mode string, replacing all instances of FLEX\n * with the full set of FLEX modes used by otp-2\n * @param {*} mode a mode String, not an array\n * @returns a mode String, not an array (with flex modes expanded)\n */\nexport function expandOtpFlexMode(mode) {\n const modes = reduceOtpFlexModes(mode.split(\",\"));\n return modes\n .map(m => {\n // If both the expanded and shrunk modes are included, remove the expanded one\n if (m === \"FLEX_EGRESS\" || m === \"FLEX_ACCESS\" || m === \"FLEX_DIRECT\") {\n if (mode.includes(\"FLEX\")) return \"\";\n }\n if (m === \"FLEX\") {\n return \"FLEX_EGRESS,FLEX_ACCESS,FLEX_DIRECT\";\n }\n return m;\n })\n .join(\",\");\n}\n\n/**\n * Determines whether the specified query differs from the default query, i.e.,\n * whether the user has modified any trip options (including mode) from their\n * default values.\n */\nexport function isNotDefaultQuery(query, config) {\n const activeModes = reduceOtpFlexModes(\n query.mode.split(\",\").sort(),\n config.modes?.mergeFlex\n );\n if (\n activeModes.length !== 2 ||\n activeModes[0] !== \"TRANSIT\" ||\n activeModes[1] !== \"WALK\"\n ) {\n // Default mode is TRANSIT,WALK. If general TRANSIT is not used, check\n // against available transit modes in config.\n const defaultModes = getTransitModes(config)\n .concat([\"WALK\"])\n .sort();\n const modesEqual =\n activeModes.length === defaultModes.length &&\n activeModes.every((value, index) => {\n return value === defaultModes[index];\n });\n if (!modesEqual) return true;\n }\n // If modes are equal, check the remaining params.\n const defaultQuery = getDefaultQuery(config);\n for (let i = 0; i < defaultParams.length; i++) {\n const param = defaultParams[i];\n const paramInfo = queryParams.find(qp => qp.name === param);\n // If the parameter applies to the query and does not match the default\n // value, the query is not default.\n if (\n isParamApplicable(paramInfo, query, config) &&\n query[param] !== defaultQuery[param]\n ) {\n return true;\n }\n }\n return false;\n}\n\n/**\n * Geocode utility for returning the first result for the provided place name text.\n * @param {string} text - text to search\n * @param {Object} geocoderConfig\n * @return {Location}\n */\nasync function getFirstGeocodeResult(text, geocoderConfig) {\n const geocoder = getGeocoder(geocoderConfig);\n // Attempt to geocode search text and return first result if found.\n // TODO: Import geocoder from @opentripplanner\n return geocoder.search({ text }).then(result => {\n const firstResult = result.features && result.features[0];\n if (firstResult) {\n return geocoder.getLocationFromGeocodedFeature(firstResult);\n }\n return null;\n });\n}\n\n/**\n * OTP allows passing a location in the form '123 Main St::lat,lon', so we check\n * for the double colon and parse the coordinates accordingly.\n * @param {string} value - query param for place described above\n * @return {Location} - location or null if the value is falsey or the parsed\n * coordinates do not result in both a lat and lon\n */\nexport function parseLocationString(value) {\n if (!value) return null;\n const parts = value.split(\"::\");\n const coordinates = parts[1]\n ? stringToCoords(parts[1])\n : stringToCoords(parts[0]);\n const name = parts[1] ? parts[0] : coordsToString(coordinates);\n return coordinates.length === 2\n ? {\n name: name || null,\n lat: coordinates[0] || null,\n lon: coordinates[1] || null\n }\n : null;\n}\n\n/**\n * Convert a string query param for a from or to place into a location. If\n * coordinates not provided and geocoder config is present, use the first\n * geocoded result.\n * @param {string} value\n * @param {Object} [geocoderConfig=null]\n * @return {Location}\n */\nasync function queryParamToLocation(value, geocoderConfig) {\n let location = parseLocationString(value);\n if (!location && value && geocoderConfig) {\n // If a valid location was not found, but the place name text exists,\n // attempt to geocode the name.\n location = await getFirstGeocodeResult(value, geocoderConfig);\n }\n return location;\n}\n\n/**\n * Create a otp query based on a the url params.\n *\n * @param {Object} params An object representing the parsed querystring of url\n * params.\n */\nexport function planParamsToQuery(params) {\n const query = {};\n Object.keys(params).forEach(key => {\n switch (key) {\n case \"fromPlace\":\n query.from = parseLocationString(params.fromPlace);\n break;\n case \"toPlace\":\n query.to = parseLocationString(params.toPlace);\n break;\n case \"arriveBy\":\n query.departArrive =\n params.arriveBy === \"true\"\n ? \"ARRIVE\"\n : params.arriveBy === \"false\"\n ? \"DEPART\"\n : \"NOW\";\n break;\n case \"date\":\n query.date = params.date || getCurrentDate();\n break;\n case \"time\":\n {\n // Match one of the supported time formats\n const matchedTimeFormat = TIME_FORMATS.find(timeFormat =>\n isMatch(params.time, timeFormat)\n );\n query.time = matchedTimeFormat\n ? format(\n parse(params.time, matchedTimeFormat, new Date()),\n OTP_API_TIME_FORMAT\n )\n : getCurrentTime();\n }\n break;\n case \"intermediatePlaces\":\n // If query has intermediate places, ensure that they are parsed\n // as locations.\n query.intermediatePlaces = params.intermediatePlaces\n ? params.intermediatePlaces.map(parseLocationString)\n : [];\n break;\n default: {\n const maybeNumber = Number(params[key]);\n // If the param value is an empty string literal and is not a number,\n // use string value. Else, use parsed number value.\n // See https://github.com/opentripplanner/otp-ui/issues/50\n query[key] =\n params[key] === \"\" || Number.isNaN(maybeNumber)\n ? params[key]\n : maybeNumber;\n break;\n }\n }\n });\n return query;\n}\n\n/**\n * Async method to create a otp query based on a the url params. This provides\n * the same functionality as planParamsToQuery, except that it will also attempt\n * to geocode the input from and to strings if no lat/lng values were provided.\n *\n * @param {Object} params An object representing the parsed querystring of url\n * params.\n * @param config the config in the otp-rr store.\n */\nexport async function planParamsToQueryAsync(params, config = {}) {\n // Construct query from plan params.\n const query = planParamsToQuery(params);\n // Attempt to geocode from and to params if the string parsing does not return\n // valid locations.\n if (!query.from) {\n query.from = await queryParamToLocation(params.fromPlace, config.geocoder);\n }\n if (!query.to) {\n query.to = await queryParamToLocation(params.toPlace, config.geocoder);\n }\n return query;\n}\n\n/**\n * Create an object that can be used as a querystring in making an OTP\n * PlannerResource request.\n *\n * See http://otp-docs.ibi-transit.com/api/resource_PlannerResource.html\n *\n * @param {Object} config The OTP application config. See types#configType\n * @param {Object} currentQuery The current query parameters as saved in the\n * application state. This method does some extra logic on top of this data\n * in order to create a request suitable for OTP. See __tests__/query.js#L14 for more.\n * @param {boolean} ignoreRealtimeUpdates If true, will create a request that\n * does not use realtime data.\n */\nexport function getRoutingParams(config, currentQuery, ignoreRealtimeUpdates) {\n const routingType = currentQuery.routingType;\n const isItinerary = routingType === \"ITINERARY\";\n let params = {};\n\n // Start with the universe of OTP parameters defined in query-params.js:\n queryParams\n .filter(qp => {\n // A given parameter is included in the request if all of the following:\n // 1. Must apply to the active routing type (ITINERARY or PROFILE)\n // 2. Must be included in the current user-defined query\n // 3. Must pass the parameter's applicability test, if one is specified\n return (\n qp.routingTypes.indexOf(routingType) !== -1 &&\n qp.name in currentQuery &&\n (typeof qp.applicable !== \"function\" ||\n qp.applicable(currentQuery, config))\n );\n })\n .forEach(qp => {\n // Translate the applicable parameters according to their rewrite\n // functions (if provided)\n const rewriteFunction = isItinerary\n ? qp.itineraryRewrite\n : qp.profileRewrite;\n params = Object.assign(\n params,\n rewriteFunction\n ? rewriteFunction(currentQuery[qp.name])\n : { [qp.name]: currentQuery[qp.name] }\n );\n });\n\n // Additional processing specific to ITINERARY mode\n if (isItinerary) {\n // override ignoreRealtimeUpdates if provided\n if (typeof ignoreRealtimeUpdates === \"boolean\") {\n params.ignoreRealtimeUpdates = ignoreRealtimeUpdates;\n }\n\n // check date/time validity; ignore both if either is invalid\n const dateValid = isMatch(params.date, OTP_API_DATE_FORMAT);\n const timeValid = isMatch(params.time, OTP_API_TIME_FORMAT);\n\n if (!dateValid || !timeValid) {\n delete params.time;\n delete params.date;\n }\n\n // temp: set additional parameters for CAR_HAIL or CAR_RENT trips\n if (\n params.mode &&\n (params.mode.includes(\"CAR_HAIL\") || params.mode.includes(\"CAR_RENT\"))\n ) {\n params.minTransitDistance = \"50%\";\n // increase search timeout because these queries can take a while\n params.searchTimeout = 10000;\n }\n\n // set onlyTransitTrips for car rental searches\n if (params.mode && params.mode.includes(\"CAR_RENT\")) {\n params.onlyTransitTrips = true;\n }\n\n // Additional processing specific to PROFILE mode\n } else {\n // check start and end time validity; ignore both if either is invalid\n const startTimeValid = isMatch(params.startTime, OTP_API_TIME_FORMAT);\n const endTimeValid = isMatch(params.endTime, OTP_API_TIME_FORMAT);\n\n if (!startTimeValid || !endTimeValid) {\n delete params.startTimeValid;\n delete params.endTimeValid;\n }\n }\n\n // TODO: check that valid from/to locations are provided\n\n // hack to add walking to driving/TNC trips\n if (hasCar(params.mode)) {\n params.mode += \",WALK\";\n }\n\n // Replace FLEX placeholder with OTP flex modes\n // Explicit false check allows avoiding a breaking change -- undefined is true\n if (params.mode && config.modes?.mergeFlex !== false) {\n // Ensure query is in reduced format to avoid replacing twice\n const reducedMode = reduceOtpFlexModes(params.mode.split(\",\")).join(\",\");\n params.mode = expandOtpFlexMode(reducedMode);\n }\n\n return params;\n}\n"],"file":"query.js"}
|
|
1
|
+
{"version":3,"sources":["../src/query.js"],"names":["defaultParams","TIME_FORMATS","getQueryParamProperty","paramInfo","property","query","ensureSingleAccessMode","queryModes","accessCount","filter","m","length","firstAccess","find","push","getUrlParams","qs","parse","window","location","href","split","getOtpUrlParams","Object","keys","key","startsWith","getTripOptionsFromQuery","keepPlace","options","time","departArrive","date","from","to","getDefaultQueryParamValue","param","default","getDefaultQuery","config","defaultQuery","routingType","queryParams","qp","forEach","name","routingTypes","defaultQueryParams","isParamApplicable","applicable","includes","reduceOtpFlexModes","modes","enabled","reduce","prev","cur","newModes","expandOtpFlexMode","mode","map","join","isNotDefaultQuery","activeModes","sort","mergeFlex","defaultModes","concat","modesEqual","every","value","index","i","getFirstGeocodeResult","text","geocoderConfig","geocoder","search","then","result","firstResult","features","getLocationFromGeocodedFeature","parseLocationString","parts","coordinates","lat","lon","queryParamToLocation","planParamsToQuery","params","fromPlace","toPlace","arriveBy","matchedTimeFormat","timeFormat","Date","OTP_API_TIME_FORMAT","intermediatePlaces","maybeNumber","Number","isNaN","planParamsToQueryAsync","getRoutingParams","currentQuery","ignoreRealtimeUpdates","isItinerary","indexOf","rewriteFunction","itineraryRewrite","profileRewrite","assign","dateValid","OTP_API_DATE_FORMAT","timeValid","minTransitDistance","searchTimeout","onlyTransitTrips","startTimeValid","startTime","endTimeValid","endTime","reducedMode"],"mappings":"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","sourcesContent":["import { format, isMatch, parse } from \"date-fns\";\nimport getGeocoder from \"@opentripplanner/geocoder/lib\";\nimport qs from \"qs\";\n\nimport { getTransitModes, hasCar, isAccessMode } from \"./itinerary\";\nimport { coordsToString, stringToCoords } from \"./map\";\nimport queryParams from \"./query-params\";\nimport {\n getCurrentTime,\n getCurrentDate,\n OTP_API_DATE_FORMAT,\n OTP_API_TIME_FORMAT\n} from \"./time\";\n\n/* The list of default parameters considered in the settings panel */\n\nexport const defaultParams = [\n \"wheelchair\",\n \"maxWalkDistance\",\n \"walkReluctance\",\n \"maxWalkTime\",\n \"maxBikeDistance\",\n \"maxBikeTime\",\n \"bikeSpeed\",\n \"optimize\",\n \"optimizeBike\",\n \"maxEScooterDistance\",\n \"watts\"\n];\n\n/**\n * List of time formats to parse when reading query params.\n */\nconst TIME_FORMATS = [\n \"HH:mm:ss\",\n \"HH:mm\",\n \"H:mm\",\n \"h:mm:ss a\",\n \"h:mm:ssa\",\n \"h:mm a\",\n \"h:mma\",\n \"h:mm\",\n \"HHmm\",\n \"hmm\",\n \"ha\"\n];\n\n/* A function to retrieve a property value from an entry in the query-params\n * table, checking for either a static value or a function */\n\nexport function getQueryParamProperty(paramInfo, property, query) {\n return typeof paramInfo[property] === \"function\"\n ? paramInfo[property](query)\n : paramInfo[property];\n}\n\nexport function ensureSingleAccessMode(queryModes) {\n // Count the number of access modes\n const accessCount = queryModes.filter(m => isAccessMode(m)).length;\n\n // If multiple access modes are specified, keep only the first one\n if (accessCount > 1) {\n const firstAccess = queryModes.find(m => isAccessMode(m));\n queryModes = queryModes.filter(m => !isAccessMode(m) || m === firstAccess);\n\n // If no access modes are specified, add 'WALK' as the default\n } else if (accessCount === 0) {\n queryModes.push(\"WALK\");\n }\n\n return queryModes;\n}\n\nexport function getUrlParams() {\n return qs.parse(window.location.href.split(\"?\")[1]);\n}\n\nexport function getOtpUrlParams() {\n return Object.keys(getUrlParams()).filter(key => !key.startsWith(\"ui_\"));\n}\n\nexport function getTripOptionsFromQuery(query, keepPlace = false) {\n const options = { ...query };\n // Delete time/date options and from/to\n delete options.time;\n delete options.departArrive;\n delete options.date;\n if (!keepPlace) {\n delete options.from;\n delete options.to;\n }\n return options;\n}\n\n/**\n * Gets the query param's default value that is either a constant or by\n * executing the default value function.\n */\nfunction getDefaultQueryParamValue(param) {\n return typeof param.default === \"function\" ? param.default() : param.default;\n}\n\n/**\n * Get the default query to OTP based on the given config.\n */\nexport function getDefaultQuery(config = null) {\n const defaultQuery = { routingType: \"ITINERARY\" };\n queryParams\n .filter(qp => \"default\" in qp)\n .forEach(qp => {\n defaultQuery[qp.name] = getDefaultQueryParamValue(qp);\n });\n if (config) {\n if (config.routingTypes && config.routingTypes.length > 0) {\n defaultQuery.routingType = config.routingTypes[0].key;\n }\n if (config.defaultQueryParams) {\n Object.keys(config.defaultQueryParams).forEach(key => {\n defaultQuery[key] = config.defaultQueryParams[key];\n });\n }\n }\n return defaultQuery;\n}\n\n/**\n * Determine if the specified query param applies to the given query (based on\n * routing type and the param's own applicable function).\n * @param paramInfo an entry from query-params.js\n * @param query the query against which to check if the param applies\n * @param config OTP config\n * @return {Boolean}\n */\nfunction isParamApplicable(paramInfo, query, config) {\n const { applicable, routingTypes } = paramInfo;\n if (!routingTypes.includes(query.routingType)) return false;\n if (typeof applicable === \"function\" && !applicable(query, config)) {\n return false;\n }\n return true;\n}\n\n/**\n * Helper method which replaces OTP flex modes with single FLEX mode that's\n * more useful and easier to work with.\n */\nexport function reduceOtpFlexModes(modes, enabled = true) {\n if (!enabled) return modes;\n\n return modes.reduce((prev, cur) => {\n const newModes = prev;\n // Add the current mode if it is not a flex mode\n if (!cur.includes(\"FLEX\")) {\n newModes.push(cur);\n // If it is a flex mode, do not add it but rather add the custom flex mode\n // if not already present\n } else if (!newModes.includes(\"FLEX\")) {\n newModes.push(\"FLEX\");\n }\n return newModes;\n }, []);\n}\n\n/**\n * Helper method to process a mode string, replacing all instances of FLEX\n * with the full set of FLEX modes used by otp-2\n * @param {*} mode a mode String, not an array\n * @returns a mode String, not an array (with flex modes expanded)\n */\nexport function expandOtpFlexMode(mode) {\n const modes = reduceOtpFlexModes(mode.split(\",\"));\n return modes\n .map(m => {\n // If both the expanded and shrunk modes are included, remove the expanded one\n if (m === \"FLEX_EGRESS\" || m === \"FLEX_ACCESS\" || m === \"FLEX_DIRECT\") {\n if (mode.includes(\"FLEX\")) return \"\";\n }\n if (m === \"FLEX\") {\n return \"FLEX_EGRESS,FLEX_ACCESS,FLEX_DIRECT\";\n }\n return m;\n })\n .join(\",\");\n}\n\n/**\n * Determines whether the specified query differs from the default query, i.e.,\n * whether the user has modified any trip options (including mode) from their\n * default values.\n */\nexport function isNotDefaultQuery(query, config) {\n const activeModes = reduceOtpFlexModes(\n query.mode.split(\",\").sort(),\n config.modes?.mergeFlex\n );\n if (\n activeModes.length !== 2 ||\n activeModes[0] !== \"TRANSIT\" ||\n activeModes[1] !== \"WALK\"\n ) {\n // Default mode is TRANSIT,WALK. If general TRANSIT is not used, check\n // against available transit modes in config.\n const defaultModes = getTransitModes(config)\n .concat([\"WALK\"])\n .sort();\n const modesEqual =\n activeModes.length === defaultModes.length &&\n activeModes.every((value, index) => {\n return value === defaultModes[index];\n });\n if (!modesEqual) return true;\n }\n // If modes are equal, check the remaining params.\n const defaultQuery = getDefaultQuery(config);\n for (let i = 0; i < defaultParams.length; i++) {\n const param = defaultParams[i];\n const paramInfo = queryParams.find(qp => qp.name === param);\n // If the parameter applies to the query and does not match the default\n // value, the query is not default.\n if (\n isParamApplicable(paramInfo, query, config) &&\n query[param] !== defaultQuery[param]\n ) {\n return true;\n }\n }\n return false;\n}\n\n/**\n * Geocode utility for returning the first result for the provided place name text.\n * @param {string} text - text to search\n * @param {Object} geocoderConfig\n * @return {Location}\n */\nasync function getFirstGeocodeResult(text, geocoderConfig) {\n const geocoder = getGeocoder(geocoderConfig);\n // Attempt to geocode search text and return first result if found.\n // TODO: Import geocoder from @opentripplanner\n return geocoder.search({ text }).then(result => {\n const firstResult = result.features && result.features[0];\n if (firstResult) {\n return geocoder.getLocationFromGeocodedFeature(firstResult);\n }\n return null;\n });\n}\n\n/**\n * OTP allows passing a location in the form '123 Main St::lat,lon', so we check\n * for the double colon and parse the coordinates accordingly.\n * @param {string} value - query param for place described above\n * @return {Location} - location or null if the value is falsey or the parsed\n * coordinates do not result in both a lat and lon\n */\nexport function parseLocationString(value) {\n if (!value) return null;\n const parts = value.split(\"::\");\n const coordinates = parts[1]\n ? stringToCoords(parts[1])\n : stringToCoords(parts[0]);\n const name = parts[1] ? parts[0] : coordsToString(coordinates);\n return coordinates.length === 2\n ? {\n name: name || null,\n lat: coordinates[0] || null,\n lon: coordinates[1] || null\n }\n : null;\n}\n\n/**\n * Convert a string query param for a from or to place into a location. If\n * coordinates not provided and geocoder config is present, use the first\n * geocoded result.\n * @param {string} value\n * @param {Object} [geocoderConfig=null]\n * @return {Location}\n */\nasync function queryParamToLocation(value, geocoderConfig) {\n let location = parseLocationString(value);\n if (!location && value && geocoderConfig) {\n // If a valid location was not found, but the place name text exists,\n // attempt to geocode the name.\n location = await getFirstGeocodeResult(value, geocoderConfig);\n }\n return location;\n}\n\n/**\n * Create a otp query based on a the url params.\n *\n * @param {Object} params An object representing the parsed querystring of url\n * params.\n */\nexport function planParamsToQuery(params) {\n const query = {};\n Object.keys(params).forEach(key => {\n switch (key) {\n case \"fromPlace\":\n query.from = parseLocationString(params.fromPlace);\n break;\n case \"toPlace\":\n query.to = parseLocationString(params.toPlace);\n break;\n case \"arriveBy\":\n query.departArrive =\n params.arriveBy === \"true\"\n ? \"ARRIVE\"\n : params.arriveBy === \"false\"\n ? \"DEPART\"\n : \"NOW\";\n break;\n case \"date\":\n query.date = params.date || getCurrentDate();\n break;\n case \"time\":\n {\n // Match one of the supported time formats\n const matchedTimeFormat = TIME_FORMATS.find(timeFormat =>\n isMatch(params.time, timeFormat)\n );\n query.time = matchedTimeFormat\n ? format(\n parse(params.time, matchedTimeFormat, new Date()),\n OTP_API_TIME_FORMAT\n )\n : getCurrentTime();\n }\n break;\n case \"intermediatePlaces\":\n // If query has intermediate places, ensure that they are parsed\n // as locations.\n query.intermediatePlaces = params.intermediatePlaces\n ? params.intermediatePlaces.map(parseLocationString)\n : [];\n break;\n default: {\n const maybeNumber = Number(params[key]);\n // If the param value is an empty string literal and is not a number,\n // use string value. Else, use parsed number value.\n // See https://github.com/opentripplanner/otp-ui/issues/50\n query[key] =\n params[key] === \"\" || Number.isNaN(maybeNumber)\n ? params[key]\n : maybeNumber;\n break;\n }\n }\n });\n return query;\n}\n\n/**\n * Async method to create a otp query based on a the url params. This provides\n * the same functionality as planParamsToQuery, except that it will also attempt\n * to geocode the input from and to strings if no lat/lng values were provided.\n *\n * @param {Object} params An object representing the parsed querystring of url\n * params.\n * @param config the config in the otp-rr store.\n */\nexport async function planParamsToQueryAsync(params, config = {}) {\n // Construct query from plan params.\n const query = planParamsToQuery(params);\n // Attempt to geocode from and to params if the string parsing does not return\n // valid locations.\n if (!query.from) {\n query.from = await queryParamToLocation(params.fromPlace, config.geocoder);\n }\n if (!query.to) {\n query.to = await queryParamToLocation(params.toPlace, config.geocoder);\n }\n return query;\n}\n\n/**\n * Create an object that can be used as a querystring in making an OTP\n * PlannerResource request.\n *\n * See http://otp-docs.ibi-transit.com/api/resource_PlannerResource.html\n *\n * @param {Object} config The OTP application config. See types#configType\n * @param {Object} currentQuery The current query parameters as saved in the\n * application state. This method does some extra logic on top of this data\n * in order to create a request suitable for OTP. See __tests__/query.js#L14 for more.\n * @param {boolean} ignoreRealtimeUpdates If true, will create a request that\n * does not use realtime data.\n */\nexport function getRoutingParams(config, currentQuery, ignoreRealtimeUpdates) {\n const routingType = currentQuery.routingType;\n const isItinerary = routingType === \"ITINERARY\";\n let params = {};\n\n // Start with the universe of OTP parameters defined in query-params.js:\n queryParams\n .filter(qp => {\n // A given parameter is included in the request if all of the following:\n // 1. Must apply to the active routing type (ITINERARY or PROFILE)\n // 2. Must be included in the current user-defined query\n // 3. Must pass the parameter's applicability test, if one is specified\n return (\n qp.routingTypes.indexOf(routingType) !== -1 &&\n qp.name in currentQuery &&\n (typeof qp.applicable !== \"function\" ||\n qp.applicable(currentQuery, config))\n );\n })\n .forEach(qp => {\n // Translate the applicable parameters according to their rewrite\n // functions (if provided)\n const rewriteFunction = isItinerary\n ? qp.itineraryRewrite\n : qp.profileRewrite;\n params = Object.assign(\n params,\n rewriteFunction\n ? rewriteFunction(currentQuery[qp.name])\n : { [qp.name]: currentQuery[qp.name] }\n );\n });\n\n // Additional processing specific to ITINERARY mode\n if (isItinerary) {\n // override ignoreRealtimeUpdates if provided\n if (typeof ignoreRealtimeUpdates === \"boolean\") {\n params.ignoreRealtimeUpdates = ignoreRealtimeUpdates;\n }\n\n // check date/time validity; ignore both if either is invalid\n const dateValid = isMatch(params.date, OTP_API_DATE_FORMAT);\n const timeValid = isMatch(params.time, OTP_API_TIME_FORMAT);\n\n if (!dateValid || !timeValid) {\n delete params.time;\n delete params.date;\n }\n\n // temp: set additional parameters for CAR_HAIL or CAR_RENT trips\n if (\n params.mode &&\n (params.mode.includes(\"CAR_HAIL\") || params.mode.includes(\"CAR_RENT\"))\n ) {\n params.minTransitDistance = \"50%\";\n // increase search timeout because these queries can take a while\n params.searchTimeout = 10000;\n }\n\n // set onlyTransitTrips for car rental searches\n if (params.mode && params.mode.includes(\"CAR_RENT\")) {\n params.onlyTransitTrips = true;\n }\n\n // Additional processing specific to PROFILE mode\n } else {\n // check start and end time validity; ignore both if either is invalid\n const startTimeValid = isMatch(params.startTime, OTP_API_TIME_FORMAT);\n const endTimeValid = isMatch(params.endTime, OTP_API_TIME_FORMAT);\n\n if (!startTimeValid || !endTimeValid) {\n delete params.startTimeValid;\n delete params.endTimeValid;\n }\n }\n\n // TODO: check that valid from/to locations are provided\n\n // hack to add walking to driving/TNC trips\n if (hasCar(params.mode)) {\n params.mode += \",WALK\";\n }\n\n // Replace FLEX placeholder with OTP flex modes\n // Explicit false check allows avoiding a breaking change -- undefined is true\n if (params.mode && config.modes?.mergeFlex !== false) {\n // Ensure query is in reduced format to avoid replacing twice\n const reducedMode = reduceOtpFlexModes(params.mode.split(\",\")).join(\",\");\n params.mode = expandOtpFlexMode(reducedMode);\n }\n\n return params;\n}\n"],"file":"query.js"}
|
package/lib/storage.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAK5D;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,GAAE,OAAc,GAAG,OAAO,CAY3E;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAE5C;AAED;;;GAGG;AACH,wBAAgB,MAAM,IAAI,MAAM,CAI/B"}
|
package/lib/storage.js
CHANGED
|
@@ -16,9 +16,7 @@ const STORAGE_PREFIX = "otp";
|
|
|
16
16
|
*/
|
|
17
17
|
|
|
18
18
|
function storeItem(key, object) {
|
|
19
|
-
|
|
20
|
-
window.localStorage.setItem(`${STORAGE_PREFIX}.${key}`, JSON.stringify(object));
|
|
21
|
-
}
|
|
19
|
+
window.localStorage.setItem(`${STORAGE_PREFIX}.${key}`, JSON.stringify(object));
|
|
22
20
|
}
|
|
23
21
|
/**
|
|
24
22
|
* Retrieve a javascript object at the specified key. If not found, defaults to
|
|
@@ -46,9 +44,7 @@ function getItem(key, notFoundValue = null) {
|
|
|
46
44
|
|
|
47
45
|
|
|
48
46
|
function removeItem(key) {
|
|
49
|
-
|
|
50
|
-
window.localStorage.removeItem(`${STORAGE_PREFIX}.${key}`);
|
|
51
|
-
}
|
|
47
|
+
window.localStorage.removeItem(`${STORAGE_PREFIX}.${key}`);
|
|
52
48
|
}
|
|
53
49
|
/**
|
|
54
50
|
* Generate a random ID. This might not quite be a UUID, but it serves our
|
package/lib/storage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/storage.ts"],"names":["STORAGE_PREFIX","storeItem","key","object","window","localStorage","setItem","JSON","stringify","getItem","notFoundValue","itemAsString","json","parse","e","console","warn","removeItem","randId","Math","random","toString","substr"],"mappings":";;;;;;;;;;AAAA;AACA;AACA,MAAMA,cAAc,GAAG,KAAvB;AAEA;AACA;AACA;;AACO,SAASC,SAAT,CAAmBC,GAAnB,EAAgCC,MAAhC,EAAuD;
|
|
1
|
+
{"version":3,"sources":["../src/storage.ts"],"names":["STORAGE_PREFIX","storeItem","key","object","window","localStorage","setItem","JSON","stringify","getItem","notFoundValue","itemAsString","json","parse","e","console","warn","removeItem","randId","Math","random","toString","substr"],"mappings":";;;;;;;;;;AAAA;AACA;AACA,MAAMA,cAAc,GAAG,KAAvB;AAEA;AACA;AACA;;AACO,SAASC,SAAT,CAAmBC,GAAnB,EAAgCC,MAAhC,EAAuD;AAC5DC,EAAAA,MAAM,CAACC,YAAP,CAAoBC,OAApB,CACG,GAAEN,cAAe,IAAGE,GAAI,EAD3B,EAEEK,IAAI,CAACC,SAAL,CAAeL,MAAf,CAFF;AAID;AAED;AACA;AACA;AACA;;;AACO,SAASM,OAAT,CAAiBP,GAAjB,EAA8BQ,aAAsB,GAAG,IAAvD,EAAsE;AAC3E,MAAIC,YAAJ;;AACA,MAAI;AACFA,IAAAA,YAAY,GAAGP,MAAM,CAACC,YAAP,CAAoBI,OAApB,CAA6B,GAAET,cAAe,IAAGE,GAAI,EAArD,CAAf;AACA,UAAMU,IAAI,GAAGL,IAAI,CAACM,KAAL,CAAWF,YAAX,CAAb;AACA,QAAIC,IAAJ,EAAU,OAAOA,IAAP;AACV,WAAOF,aAAP;AACD,GALD,CAKE,OAAOI,CAAP,EAAU;AACV;AACAC,IAAAA,OAAO,CAACC,IAAR,CAAaF,CAAb,EAAgBH,YAAhB;AACA,WAAOD,aAAP;AACD;AACF;AAED;AACA;AACA;;;AACO,SAASO,UAAT,CAAoBf,GAApB,EAAuC;AAC5CE,EAAAA,MAAM,CAACC,YAAP,CAAoBY,UAApB,CAAgC,GAAEjB,cAAe,IAAGE,GAAI,EAAxD;AACD;AAED;AACA;AACA;AACA;;;AACO,SAASgB,MAAT,GAA0B;AAC/B,SAAOC,IAAI,CAACC,MAAL,GACJC,QADI,CACK,EADL,EAEJC,MAFI,CAEG,CAFH,EAEM,CAFN,CAAP;AAGD","sourcesContent":["/* eslint-disable no-console */\n// Prefix to use with local storage keys.\nconst STORAGE_PREFIX = \"otp\";\n\n/**\n * Store a javascript object at the specified key.\n */\nexport function storeItem(key: string, object: unknown): void {\n window.localStorage.setItem(\n `${STORAGE_PREFIX}.${key}`,\n JSON.stringify(object)\n );\n}\n\n/**\n * Retrieve a javascript object at the specified key. If not found, defaults to\n * null or, the optionally provided notFoundValue.\n */\nexport function getItem(key: string, notFoundValue: unknown = null): unknown {\n let itemAsString: string;\n try {\n itemAsString = window.localStorage.getItem(`${STORAGE_PREFIX}.${key}`);\n const json = JSON.parse(itemAsString);\n if (json) return json;\n return notFoundValue;\n } catch (e) {\n // Catch any errors associated with parsing bad JSON.\n console.warn(e, itemAsString);\n return notFoundValue;\n }\n}\n\n/**\n * Remove item at specified key.\n */\nexport function removeItem(key: string): void {\n window.localStorage.removeItem(`${STORAGE_PREFIX}.${key}`);\n}\n\n/**\n * Generate a random ID. This might not quite be a UUID, but it serves our\n * purposes for now.\n */\nexport function randId(): string {\n return Math.random()\n .toString(36)\n .substr(2, 9);\n}\n"],"file":"storage.js"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ReactElement, ReactNode } from "react";
|
|
2
|
+
declare type Props = {
|
|
3
|
+
children: ReactNode;
|
|
4
|
+
fallback: ReactNode;
|
|
5
|
+
};
|
|
6
|
+
declare const SafeSuspense: ({ children, fallback }: Props) => ReactElement;
|
|
7
|
+
export default SafeSuspense;
|
|
8
|
+
//# sourceMappingURL=suspense.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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/lib/suspense.js
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.default = void 0;
|
|
7
|
+
|
|
8
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
9
|
+
|
|
10
|
+
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); }
|
|
11
|
+
|
|
12
|
+
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; }
|
|
13
|
+
|
|
14
|
+
const SafeSuspense = ({
|
|
15
|
+
children,
|
|
16
|
+
fallback
|
|
17
|
+
}) => {
|
|
18
|
+
const IS_TEST_RUNNER = window.navigator.userAgent.match(/StorybookTestRunner/);
|
|
19
|
+
return IS_TEST_RUNNER ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, fallback) : /*#__PURE__*/_react.default.createElement(_react.Suspense, {
|
|
20
|
+
fallback: fallback
|
|
21
|
+
}, children);
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
var _default = SafeSuspense;
|
|
25
|
+
exports.default = _default;
|
|
26
|
+
//# sourceMappingURL=suspense.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/suspense.tsx"],"names":["SafeSuspense","children","fallback","IS_TEST_RUNNER","window","navigator","userAgent","match"],"mappings":";;;;;;;AAAA;;;;;;AAOA,MAAMA,YAAY,GAAG,CAAC;AAAEC,EAAAA,QAAF;AAAYC,EAAAA;AAAZ,CAAD,KAAiD;AACpE,QAAMC,cAAc,GAAGC,MAAM,CAACC,SAAP,CAAiBC,SAAjB,CAA2BC,KAA3B,CACrB,qBADqB,CAAvB;AAGA,SAAOJ,cAAc,gBACnB,4DAAGD,QAAH,CADmB,gBAGnB,6BAAC,eAAD;AAAU,IAAA,QAAQ,EAAEA;AAApB,KAA+BD,QAA/B,CAHF;AAKD,CATD;;eAWeD,Y","sourcesContent":["import React, { ReactElement, ReactNode, Suspense } from \"react\";\n\ntype Props = {\n children: ReactNode;\n fallback: ReactNode;\n};\n\nconst SafeSuspense = ({ children, fallback }: Props): ReactElement => {\n const IS_TEST_RUNNER = window.navigator.userAgent.match(\n /StorybookTestRunner/\n );\n return IS_TEST_RUNNER ? (\n <>{fallback}</>\n ) : (\n <Suspense fallback={fallback}>{children}</Suspense>\n );\n};\n\nexport default SafeSuspense;\n"],"file":"suspense.js"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentripplanner/core-utils",
|
|
3
|
-
"version": "12.0.0
|
|
3
|
+
"version": "12.0.0",
|
|
4
4
|
"description": "Core functionality that is shared among numerous UI components",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=13"
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"@conveyal/lonlat": "^1.4.1",
|
|
16
16
|
"@mapbox/polyline": "^1.1.0",
|
|
17
|
-
"@opentripplanner/geocoder": "^
|
|
17
|
+
"@opentripplanner/geocoder": "^3.0.2",
|
|
18
18
|
"@styled-icons/foundation": "^10.34.0",
|
|
19
19
|
"@turf/along": "^6.0.1",
|
|
20
20
|
"chroma-js": "^2.4.2",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"tsc": "tsc"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@opentripplanner/types": "^6.
|
|
33
|
+
"@opentripplanner/types": "^6.5.2",
|
|
34
34
|
"@types/chroma-js": "^2.1.4"
|
|
35
35
|
}
|
|
36
36
|
}
|
|
@@ -1,18 +1,23 @@
|
|
|
1
|
+
import { ElevationProfile } from "@opentripplanner/types";
|
|
1
2
|
import {
|
|
2
3
|
calculateTncFares,
|
|
3
4
|
getCompanyFromLeg,
|
|
4
5
|
getDisplayedStopId,
|
|
6
|
+
getElevationProfile,
|
|
5
7
|
getItineraryCost,
|
|
6
8
|
getLegCost,
|
|
7
9
|
getLegRouteLongName,
|
|
8
10
|
getLegRouteName,
|
|
9
11
|
getLegRouteShortName,
|
|
10
|
-
|
|
12
|
+
isFlex,
|
|
13
|
+
isTransit,
|
|
14
|
+
mapOldElevationComponentToNew
|
|
11
15
|
} from "../itinerary";
|
|
12
16
|
|
|
13
17
|
const bikeRentalItinerary = require("./__mocks__/bike-rental-itinerary.json");
|
|
14
18
|
const tncItinerary = require("./__mocks__/tnc-itinerary.json");
|
|
15
19
|
const fareProductItinerary = require("./__mocks__/fare-products-itinerary.json");
|
|
20
|
+
const flexItinerary = require("../../../itinerary-body/src/__mocks__/itineraries/flex-itinerary.json");
|
|
16
21
|
|
|
17
22
|
const basePlace = {
|
|
18
23
|
lat: 0,
|
|
@@ -21,6 +26,36 @@ const basePlace = {
|
|
|
21
26
|
};
|
|
22
27
|
|
|
23
28
|
describe("util > itinerary", () => {
|
|
29
|
+
describe("getElevationProfile", () => {
|
|
30
|
+
it("should work with REST legacy data and GraphQL elevationProfile", () => {
|
|
31
|
+
const legacyOutput = getElevationProfile(
|
|
32
|
+
bikeRentalItinerary.legs[1].steps
|
|
33
|
+
);
|
|
34
|
+
const graphqlOutput = getElevationProfile(
|
|
35
|
+
bikeRentalItinerary.legs[1].steps.map(step => ({
|
|
36
|
+
...step,
|
|
37
|
+
elevationProfile: step.elevation.map(mapOldElevationComponentToNew),
|
|
38
|
+
elevation: null
|
|
39
|
+
}))
|
|
40
|
+
);
|
|
41
|
+
expect(legacyOutput).toEqual<ElevationProfile>(graphqlOutput);
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
describe("isFlex", () => {
|
|
46
|
+
it("should detect flex if present", () => {
|
|
47
|
+
fareProductItinerary.legs.forEach(leg => expect(isFlex(leg)).toBe(false));
|
|
48
|
+
tncItinerary.legs.forEach(leg => expect(isFlex(leg)).toBe(false));
|
|
49
|
+
expect(isFlex(flexItinerary.legs[0])).toBe(false);
|
|
50
|
+
expect(isFlex(flexItinerary.legs[1])).toBe(false);
|
|
51
|
+
expect(isFlex(flexItinerary.legs[2])).toBe(false);
|
|
52
|
+
expect(isFlex(flexItinerary.legs[3])).toBe(false);
|
|
53
|
+
expect(isFlex(flexItinerary.legs[4])).toBe(false);
|
|
54
|
+
expect(isFlex(flexItinerary.legs[5])).toBe(true);
|
|
55
|
+
expect(isFlex(flexItinerary.legs[6])).toBe(false); // Does not exist
|
|
56
|
+
expect(isFlex(flexItinerary.legs[7])).toBe(false); // Does not exist
|
|
57
|
+
});
|
|
58
|
+
});
|
|
24
59
|
describe("isTransit", () => {
|
|
25
60
|
it("should work", () => {
|
|
26
61
|
expect(isTransit("CAR")).toBeFalsy();
|
package/src/core-utils.story.tsx
CHANGED
|
@@ -50,7 +50,7 @@ export const RouteColorTester = (): JSX.Element => {
|
|
|
50
50
|
</>
|
|
51
51
|
);
|
|
52
52
|
};
|
|
53
|
-
// Disable color contrast checking for the uncorrected color pairs
|
|
53
|
+
// Disable color contrast checking for the uncorrected color pairs
|
|
54
54
|
RouteColorTester.parameters = {
|
|
55
55
|
a11y: { config: { rules: [{ id: "color-contrast", reviewOnFail: true }] } },
|
|
56
56
|
storyshots: { disable: true }
|
package/src/index.ts
CHANGED
|
@@ -8,6 +8,7 @@ import * as storage from "./storage";
|
|
|
8
8
|
import * as time from "./time";
|
|
9
9
|
import * as ui from "./ui";
|
|
10
10
|
import * as queryGen from "./query-gen";
|
|
11
|
+
import SafeSuspense from "./suspense";
|
|
11
12
|
|
|
12
13
|
const core = {
|
|
13
14
|
itinerary,
|
|
@@ -22,4 +23,5 @@ const core = {
|
|
|
22
23
|
ui
|
|
23
24
|
};
|
|
24
25
|
|
|
26
|
+
export { SafeSuspense };
|
|
25
27
|
export default core;
|
package/src/itinerary.ts
CHANGED
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
Company,
|
|
4
4
|
Config,
|
|
5
5
|
ElevationProfile,
|
|
6
|
+
ElevationProfileComponent,
|
|
6
7
|
FlexBookingInfo,
|
|
7
8
|
ItineraryOnlyLegsRequired,
|
|
8
9
|
LatLngArray,
|
|
@@ -41,6 +42,10 @@ export function getTransitModes(config: Config): string[] {
|
|
|
41
42
|
);
|
|
42
43
|
}
|
|
43
44
|
|
|
45
|
+
export function isTransitLeg(leg: Leg): boolean {
|
|
46
|
+
return leg.transitLeg;
|
|
47
|
+
}
|
|
48
|
+
|
|
44
49
|
export function isTransit(mode: string): boolean {
|
|
45
50
|
return transitModes.includes(mode) || mode === "TRANSIT";
|
|
46
51
|
}
|
|
@@ -51,7 +56,7 @@ export function isTransit(mode: string): boolean {
|
|
|
51
56
|
* property which encodes this info.
|
|
52
57
|
*/
|
|
53
58
|
export function isReservationRequired(leg: Leg): boolean {
|
|
54
|
-
return leg
|
|
59
|
+
return leg?.boardRule === "mustPhone" || leg?.alightRule === "mustPhone";
|
|
55
60
|
}
|
|
56
61
|
/**
|
|
57
62
|
* Returns true if a user must ask the driver to let the user off
|
|
@@ -60,26 +65,45 @@ export function isReservationRequired(leg: Leg): boolean {
|
|
|
60
65
|
*/
|
|
61
66
|
export function isCoordinationRequired(leg: Leg): boolean {
|
|
62
67
|
return (
|
|
63
|
-
leg
|
|
64
|
-
leg
|
|
68
|
+
leg?.boardRule === "coordinateWithDriver" ||
|
|
69
|
+
leg?.alightRule === "coordinateWithDriver"
|
|
65
70
|
);
|
|
66
71
|
}
|
|
67
|
-
/**
|
|
68
|
-
* The two rules checked by the above two functions are the only values
|
|
69
|
-
* returned by OTP when a leg is a flex leg.
|
|
70
|
-
*/
|
|
71
|
-
export function isFlex(leg: Leg): boolean {
|
|
72
|
-
return isReservationRequired(leg) || isCoordinationRequired(leg);
|
|
73
|
-
}
|
|
74
72
|
|
|
73
|
+
export function containsGeometry(place: Place): boolean {
|
|
74
|
+
return (
|
|
75
|
+
place?.stop?.geometries !== null && place?.stop?.geometries !== undefined
|
|
76
|
+
);
|
|
77
|
+
}
|
|
78
|
+
export function endsWithGeometry(leg: Leg): boolean {
|
|
79
|
+
return containsGeometry(leg?.to);
|
|
80
|
+
}
|
|
81
|
+
export function startsWithGeometry(leg: Leg): boolean {
|
|
82
|
+
return containsGeometry(leg?.from);
|
|
83
|
+
}
|
|
84
|
+
export function legContainsGeometry(leg: Leg): boolean {
|
|
85
|
+
return endsWithGeometry(leg) || startsWithGeometry(leg);
|
|
86
|
+
}
|
|
75
87
|
export function isAdvanceBookingRequired(info: FlexBookingInfo): boolean {
|
|
76
88
|
return info?.latestBookingTime?.daysPrior > 0;
|
|
77
89
|
}
|
|
78
90
|
export function legDropoffRequiresAdvanceBooking(leg: Leg): boolean {
|
|
79
|
-
return isAdvanceBookingRequired(leg
|
|
91
|
+
return isAdvanceBookingRequired(leg?.dropOffBookingInfo);
|
|
80
92
|
}
|
|
81
93
|
|
|
82
|
-
|
|
94
|
+
/**
|
|
95
|
+
* The two rules checked by the above two functions are the only values
|
|
96
|
+
* returned by OTP when a leg is a flex leg.
|
|
97
|
+
*/
|
|
98
|
+
export function isFlex(leg: Leg): boolean {
|
|
99
|
+
return (
|
|
100
|
+
isReservationRequired(leg) ||
|
|
101
|
+
isCoordinationRequired(leg) ||
|
|
102
|
+
legDropoffRequiresAdvanceBooking(leg) ||
|
|
103
|
+
isAdvanceBookingRequired(leg?.pickupBookingInfo) ||
|
|
104
|
+
legContainsGeometry(leg)
|
|
105
|
+
);
|
|
106
|
+
}
|
|
83
107
|
export function isRideshareLeg(leg: Leg): boolean {
|
|
84
108
|
return !!leg.rideHailingEstimate?.provider?.id;
|
|
85
109
|
}
|
|
@@ -319,6 +343,16 @@ export function legElevationAtDistance(
|
|
|
319
343
|
return null;
|
|
320
344
|
}
|
|
321
345
|
|
|
346
|
+
export function mapOldElevationComponentToNew(oldElev: {
|
|
347
|
+
first: number;
|
|
348
|
+
second: number;
|
|
349
|
+
}): ElevationProfileComponent {
|
|
350
|
+
return {
|
|
351
|
+
distance: oldElev.first,
|
|
352
|
+
elevation: oldElev.second
|
|
353
|
+
};
|
|
354
|
+
}
|
|
355
|
+
|
|
322
356
|
// Iterate through the steps, building the array of elevation points and
|
|
323
357
|
// keeping track of the minimum and maximum elevations reached
|
|
324
358
|
export function getElevationProfile(
|
|
@@ -330,30 +364,41 @@ export function getElevationProfile(
|
|
|
330
364
|
let traversed = 0;
|
|
331
365
|
let gain = 0;
|
|
332
366
|
let loss = 0;
|
|
333
|
-
let previous = null;
|
|
367
|
+
let previous: ElevationProfileComponent | null = null;
|
|
334
368
|
const points = [];
|
|
335
369
|
steps.forEach(step => {
|
|
336
|
-
|
|
370
|
+
// Support for old REST response data (in step.elevation)
|
|
371
|
+
const stepElevationProfile =
|
|
372
|
+
step.elevationProfile ||
|
|
373
|
+
(Array.isArray(step.elevation) &&
|
|
374
|
+
step.elevation?.map<ElevationProfileComponent>(
|
|
375
|
+
mapOldElevationComponentToNew
|
|
376
|
+
));
|
|
377
|
+
|
|
378
|
+
if (!stepElevationProfile || stepElevationProfile.length === 0) {
|
|
337
379
|
traversed += step.distance;
|
|
338
380
|
return;
|
|
339
381
|
}
|
|
340
|
-
for (let i = 0; i <
|
|
341
|
-
const elev =
|
|
382
|
+
for (let i = 0; i < stepElevationProfile.length; i++) {
|
|
383
|
+
const elev = stepElevationProfile[i];
|
|
342
384
|
if (previous) {
|
|
343
|
-
const diff = (elev.
|
|
385
|
+
const diff = (elev.elevation - previous.elevation) * unitConversion;
|
|
344
386
|
if (diff > 0) gain += diff;
|
|
345
387
|
else loss += diff;
|
|
346
388
|
}
|
|
347
|
-
if (i === 0 && elev.
|
|
389
|
+
if (i === 0 && elev.distance !== 0) {
|
|
348
390
|
// console.warn(`No elevation data available for step ${stepIndex}-${i} at beginning of segment`, elev)
|
|
349
391
|
}
|
|
350
|
-
const convertedElevation = elev.
|
|
392
|
+
const convertedElevation = elev.elevation * unitConversion;
|
|
351
393
|
if (convertedElevation < minElev) minElev = convertedElevation;
|
|
352
394
|
if (convertedElevation > maxElev) maxElev = convertedElevation;
|
|
353
|
-
points.push([traversed + elev.
|
|
395
|
+
points.push([traversed + elev.distance, elev.elevation]);
|
|
354
396
|
// Insert "filler" point if the last point in elevation profile does not
|
|
355
397
|
// reach the full distance of the step.
|
|
356
|
-
if (
|
|
398
|
+
if (
|
|
399
|
+
i === stepElevationProfile.length - 1 &&
|
|
400
|
+
elev.distance !== step.distance
|
|
401
|
+
) {
|
|
357
402
|
// points.push([traversed + step.distance, elev.second])
|
|
358
403
|
}
|
|
359
404
|
previous = elev;
|
|
@@ -411,13 +456,10 @@ export function getCompanyForNetwork(
|
|
|
411
456
|
* @return {string} A label for use in presentation on a website.
|
|
412
457
|
*/
|
|
413
458
|
export function getCompaniesLabelFromNetworks(
|
|
414
|
-
networks: string | string
|
|
459
|
+
networks: string[] | string,
|
|
415
460
|
companies: Company[] = []
|
|
416
461
|
): string {
|
|
417
|
-
|
|
418
|
-
if (typeof networks === "string") networksArray = [networks];
|
|
419
|
-
|
|
420
|
-
return (networksArray as string[])
|
|
462
|
+
return (Array.isArray(networks) ? networks : [networks])
|
|
421
463
|
.map(network => getCompanyForNetwork(network, companies))
|
|
422
464
|
.filter(co => !!co)
|
|
423
465
|
.map(co => co.label)
|
package/src/otpSchema.json
CHANGED
|
@@ -9671,18 +9671,6 @@
|
|
|
9671
9671
|
"isDeprecated": false,
|
|
9672
9672
|
"deprecationReason": null
|
|
9673
9673
|
},
|
|
9674
|
-
{
|
|
9675
|
-
"name": "stopPosition",
|
|
9676
|
-
"description": "The sequence of the stop in the pattern. This is not required to start from 0 or be consecutive - any\nincreasing integer sequence along the stops is valid.\n\nThe purpose of this field is to identify the stop within the pattern so it can be cross-referenced\nbetween it and the itinerary. It is safe to cross-reference when done quickly, i.e. within seconds.\nHowever, it should be noted that realtime updates can change the values, so don't store it for\nlonger amounts of time.\n\nDepending on the source data, this might not be the GTFS `stop_sequence` but another value, perhaps\neven generated.",
|
|
9677
|
-
"args": [],
|
|
9678
|
-
"type": {
|
|
9679
|
-
"kind": "SCALAR",
|
|
9680
|
-
"name": "Int",
|
|
9681
|
-
"ofType": null
|
|
9682
|
-
},
|
|
9683
|
-
"isDeprecated": false,
|
|
9684
|
-
"deprecationReason": null
|
|
9685
|
-
},
|
|
9686
9674
|
{
|
|
9687
9675
|
"name": "scheduledArrival",
|
|
9688
9676
|
"description": "Scheduled arrival time. Format: seconds since midnight of the departure date",
|