@opentripplanner/core-utils 7.0.0-alpha.3 → 7.0.1
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/itinerary.js +93 -63
- package/esm/itinerary.js.map +1 -1
- package/esm/map.js +2 -17
- package/esm/map.js.map +1 -1
- package/esm/query.js +11 -6
- package/esm/query.js.map +1 -1
- package/esm/time.js +4 -7
- package/esm/time.js.map +1 -1
- package/lib/itinerary.d.ts +7 -0
- package/lib/itinerary.d.ts.map +1 -1
- package/lib/itinerary.js +86 -63
- package/lib/itinerary.js.map +1 -1
- package/lib/map.d.ts +0 -1
- package/lib/map.d.ts.map +1 -1
- package/lib/map.js +2 -19
- package/lib/map.js.map +1 -1
- package/lib/query.js +10 -7
- package/lib/query.js.map +1 -1
- package/lib/time.d.ts +1 -2
- package/lib/time.d.ts.map +1 -1
- package/lib/time.js +5 -9
- package/lib/time.js.map +1 -1
- package/package.json +3 -3
- package/src/__tests__/itinerary.js +42 -32
- package/src/itinerary.ts +90 -56
- package/src/map.ts +2 -20
- package/src/query.js +12 -10
- package/src/time.ts +4 -10
- package/tsconfig.json +1 -6
- package/tsconfig.tsbuildinfo +1 -5014
package/lib/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/query.js"],"names":["defaultParams","TIME_FORMATS","OTP_API_TIME_FORMAT","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","reduce","prev","cur","newModes","expandOtpFlexMode","mode","map","join","isNotDefaultQuery","activeModes","sort","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","intermediatePlaces","maybeNumber","Number","isNaN","planParamsToQueryAsync","getRoutingParams","currentQuery","ignoreRealtimeUpdates","isItinerary","indexOf","rewriteFunction","itineraryRewrite","profileRewrite","assign","dateValid","OTP_API_DATE_FORMAT_DATE_FNS","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_TIME_FORMAT,\n OTP_API_DATE_FORMAT_DATE_FNS\n} from \"./time\";\n\n// import { coordsToString, summarizeQuery } from \"./deprecated\";\n\n// export { summarizeQuery };\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 \"walkSpeed\",\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 \"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 OTP_API_TIME_FORMAT // 'HH:mm'\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) {\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 exapnded 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(query.mode.split(\",\").sort());\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_DATE_FNS);\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 if (params.mode) {\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","OTP_API_TIME_FORMAT","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","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 \"walkSpeed\",\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 \"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 OTP_API_TIME_FORMAT // 'HH:mm'\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 exapnded 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/time.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Config } from "@opentripplanner/types";
|
|
2
|
-
export declare const OTP_API_DATE_FORMAT = "
|
|
3
|
-
export declare const OTP_API_DATE_FORMAT_DATE_FNS = "yyyy-MM-dd";
|
|
2
|
+
export declare const OTP_API_DATE_FORMAT = "yyyy-MM-dd";
|
|
4
3
|
export declare const OTP_API_TIME_FORMAT = "HH:mm";
|
|
5
4
|
/**
|
|
6
5
|
* Breaks up a duration in seconds into hours, minutes, and seconds.
|
package/lib/time.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../src/time.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAMhD,eAAO,MAAM,mBAAmB,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../src/time.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAMhD,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAChD,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAE3C;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,GACd;IACD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAMA;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAExD;AACD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,EAAE,KAAA,EAAE,OAAO,KAAA,OAErC;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,MAAM,CAGR;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,gBAAgB,SAAkB,GAAG,MAAM,CAG1E;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,SAAoB,GAAG,MAAM,CAEnE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,SAAoB,GAAG,MAAM,CAEnE"}
|
package/lib/time.js
CHANGED
|
@@ -12,20 +12,16 @@ exports.formatSecondsAfterMidnight = formatSecondsAfterMidnight;
|
|
|
12
12
|
exports.getUserTimezone = getUserTimezone;
|
|
13
13
|
exports.getCurrentTime = getCurrentTime;
|
|
14
14
|
exports.getCurrentDate = getCurrentDate;
|
|
15
|
-
exports.OTP_API_TIME_FORMAT = exports.
|
|
15
|
+
exports.OTP_API_TIME_FORMAT = exports.OTP_API_DATE_FORMAT = void 0;
|
|
16
16
|
|
|
17
17
|
var _dateFns = require("date-fns");
|
|
18
18
|
|
|
19
19
|
var _dateFnsTz = require("date-fns-tz");
|
|
20
20
|
|
|
21
|
-
//
|
|
22
|
-
//
|
|
23
|
-
const OTP_API_DATE_FORMAT = "
|
|
24
|
-
// see https://github.com/date-fns/date-fns/blob/master/docs/unicodeTokens.md
|
|
25
|
-
|
|
21
|
+
// Date/time formats (per date-fns) when sending/receiving date from OTP
|
|
22
|
+
// regardless of whatever the user has configured as the display format.
|
|
23
|
+
const OTP_API_DATE_FORMAT = "yyyy-MM-dd";
|
|
26
24
|
exports.OTP_API_DATE_FORMAT = OTP_API_DATE_FORMAT;
|
|
27
|
-
const OTP_API_DATE_FORMAT_DATE_FNS = "yyyy-MM-dd";
|
|
28
|
-
exports.OTP_API_DATE_FORMAT_DATE_FNS = OTP_API_DATE_FORMAT_DATE_FNS;
|
|
29
25
|
const OTP_API_TIME_FORMAT = "HH:mm";
|
|
30
26
|
/**
|
|
31
27
|
* Breaks up a duration in seconds into hours, minutes, and seconds.
|
|
@@ -117,6 +113,6 @@ function getCurrentTime(timezone = getUserTimezone()) {
|
|
|
117
113
|
|
|
118
114
|
|
|
119
115
|
function getCurrentDate(timezone = getUserTimezone()) {
|
|
120
|
-
return (0, _dateFns.format)((0, _dateFnsTz.utcToZonedTime)(Date.now(), timezone),
|
|
116
|
+
return (0, _dateFns.format)((0, _dateFnsTz.utcToZonedTime)(Date.now(), timezone), OTP_API_DATE_FORMAT);
|
|
121
117
|
}
|
|
122
118
|
//# sourceMappingURL=time.js.map
|
package/lib/time.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/time.ts"],"names":["OTP_API_DATE_FORMAT","
|
|
1
|
+
{"version":3,"sources":["../src/time.ts"],"names":["OTP_API_DATE_FORMAT","OTP_API_TIME_FORMAT","toHoursMinutesSeconds","seconds","hours","Math","floor","minutes","getTimeFormat","config","dateTime","timeFormat","getDateFormat","dateFormat","getLongDateFormat","longDateFormat","offsetTime","ms","options","offset","formatSecondsAfterMidnight","time","Date","getUserTimezone","fallbackTimezone","process","env","NODE_ENV","TZ","Intl","DateTimeFormat","resolvedOptions","timeZone","getCurrentTime","timezone","now","getCurrentDate"],"mappings":";;;;;;;;;;;;;;;;AACA;;AACA;;AAEA;AACA;AACO,MAAMA,mBAAmB,GAAG,YAA5B;;AACA,MAAMC,mBAAmB,GAAG,OAA5B;AAEP;AACA;AACA;AACA;AACA;;;;AACO,SAASC,qBAAT,CACLC,OADK,EAML;AACA,SAAO;AACLC,IAAAA,KAAK,EAAEC,IAAI,CAACC,KAAL,CAAWH,OAAO,GAAG,IAArB,CADF;AAELI,IAAAA,OAAO,EAAEF,IAAI,CAACC,KAAL,CAAWH,OAAO,GAAG,EAArB,IAA2B,EAF/B;AAGLA,IAAAA,OAAO,EAAEA,OAAO,GAAG;AAHd,GAAP;AAKD;AAED;AACA;AACA;AACA;;;AACO,SAASK,aAAT,CAAuBC,MAAvB,EAA+C;AAAA;;AACpD,SAAO,CAAAA,MAAM,SAAN,IAAAA,MAAM,WAAN,gCAAAA,MAAM,CAAEC,QAAR,sEAAkBC,UAAlB,KAAgCV,mBAAvC;AACD;;AAEM,SAASW,aAAT,CAAuBH,MAAvB,EAA+C;AAAA;;AACpD,SAAO,CAAAA,MAAM,SAAN,IAAAA,MAAM,WAAN,iCAAAA,MAAM,CAAEC,QAAR,wEAAkBG,UAAlB,KAAgCb,mBAAvC;AACD;;AAEM,SAASc,iBAAT,CAA2BL,MAA3B,EAAmD;AAAA;;AACxD,SAAO,CAAAA,MAAM,SAAN,IAAAA,MAAM,WAAN,iCAAAA,MAAM,CAAEC,QAAR,wEAAkBK,cAAlB,KAAoC,aAA3C;AACD;AACD;AACA;AACA;AACA;;;AACO,SAASC,UAAT,CAAoBC,EAApB,EAAwBC,OAAxB,EAAiC;AACtC,SAAOD,EAAE,IAAI,CAAAC,OAAO,SAAP,IAAAA,OAAO,WAAP,YAAAA,OAAO,CAAEC,MAAT,KAAmB,CAAvB,CAAT;AACD;AAED;AACA;AACA;AACA;AACA;AACA;;;AACO,SAASC,0BAAT,CACLjB,OADK,EAELQ,UAFK,EAGG;AACR,QAAMU,IAAI,GAAG,kBAAI,yBAAW,IAAIC,IAAJ,EAAX,CAAJ,EAA4B;AAAEnB,IAAAA;AAAF,GAA5B,CAAb;AACA,SAAO,qBAAOkB,IAAP,EAAaV,UAAb,CAAP;AACD;AAED;AACA;AACA;AACA;AACA;;;AACO,SAASY,eAAT,CAAyBC,gBAAgB,GAAG,eAA5C,EAAqE;AAAA;;AAC1E,MAAIC,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,MAA7B,EAAqC,OAAOF,OAAO,CAACC,GAAR,CAAYE,EAAnB;AACrC,SAAO,UAAAC,IAAI,UAAJ,sCAAMC,cAAN,GAAuBC,eAAvB,GAAyCC,QAAzC,KAAqDR,gBAA5D;AACD;AAED;AACA;AACA;AACA;;;AACO,SAASS,cAAT,CAAwBC,QAAQ,GAAGX,eAAe,EAAlD,EAA8D;AACnE,SAAO,qBAAO,+BAAeD,IAAI,CAACa,GAAL,EAAf,EAA2BD,QAA3B,CAAP,EAA6CjC,mBAA7C,CAAP;AACD;AAED;AACA;AACA;AACA;;;AACO,SAASmC,cAAT,CAAwBF,QAAQ,GAAGX,eAAe,EAAlD,EAA8D;AACnE,SAAO,qBAAO,+BAAeD,IAAI,CAACa,GAAL,EAAf,EAA2BD,QAA3B,CAAP,EAA6ClC,mBAA7C,CAAP;AACD","sourcesContent":["import { Config } from \"@opentripplanner/types\";\nimport { startOfDay, add, format } from \"date-fns\";\nimport { utcToZonedTime } from \"date-fns-tz\";\n\n// Date/time formats (per date-fns) when sending/receiving date from OTP\n// regardless of whatever the user has configured as the display format.\nexport const OTP_API_DATE_FORMAT = \"yyyy-MM-dd\";\nexport const OTP_API_TIME_FORMAT = \"HH:mm\";\n\n/**\n * Breaks up a duration in seconds into hours, minutes, and seconds.\n * @param {number} seconds The number of seconds to break up\n * @returns an object with fields with the corresponding, hours, minutes, seconds.\n */\nexport function toHoursMinutesSeconds(\n seconds: number\n): {\n hours: number;\n minutes: number;\n seconds: number;\n} {\n return {\n hours: Math.floor(seconds / 3600),\n minutes: Math.floor(seconds / 60) % 60,\n seconds: seconds % 60\n };\n}\n\n/**\n * @param {[type]} config the OTP config object found in store\n * @return {string} the config-defined time formatter or HH:mm (24-hr time)\n */\nexport function getTimeFormat(config: Config): string {\n return config?.dateTime?.timeFormat || OTP_API_TIME_FORMAT;\n}\n\nexport function getDateFormat(config: Config): string {\n return config?.dateTime?.dateFormat || OTP_API_DATE_FORMAT;\n}\n\nexport function getLongDateFormat(config: Config): string {\n return config?.dateTime?.longDateFormat || \"D MMMM YYYY\";\n}\n/**\n * Offsets a time according to the provided time options\n * and returns the result.\n */\nexport function offsetTime(ms, options) {\n return ms + (options?.offset || 0);\n}\n\n/**\n * Formats a seconds after midnight value for display in narrative\n * @param {number} seconds time since midnight in seconds\n * @param {string} timeFormat A valid date-fns time format\n * @return {string} formatted text representation\n */\nexport function formatSecondsAfterMidnight(\n seconds: number,\n timeFormat: string\n): string {\n const time = add(startOfDay(new Date()), { seconds });\n return format(time, timeFormat);\n}\n\n/**\n * Uses Intl.DateTimeFormat() api to get the user's time zone. In a test\n * environment, pulls timezone information from an env variable. Default to\n * GMT+0 if the Intl API is unavailable.\n */\nexport function getUserTimezone(fallbackTimezone = \"Etc/Greenwich\"): string {\n if (process.env.NODE_ENV === \"test\") return process.env.TZ;\n return Intl?.DateTimeFormat().resolvedOptions().timeZone || fallbackTimezone;\n}\n\n/**\n * Formats current time for use in OTP query\n * The conversion to the user's timezone is needed for testing purposes.\n */\nexport function getCurrentTime(timezone = getUserTimezone()): string {\n return format(utcToZonedTime(Date.now(), timezone), OTP_API_TIME_FORMAT);\n}\n\n/**\n * Formats current date for use in OTP query\n * The conversion to the user's timezone is needed for testing purposes.\n */\nexport function getCurrentDate(timezone = getUserTimezone()): string {\n return format(utcToZonedTime(Date.now(), timezone), OTP_API_DATE_FORMAT);\n}\n"],"file":"time.js"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentripplanner/core-utils",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.1",
|
|
4
4
|
"description": "Core functionality that is shared among numerous UI components",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=13"
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"private": false,
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"@mapbox/polyline": "^1.1.0",
|
|
16
|
-
"@opentripplanner/geocoder": "^1.
|
|
16
|
+
"@opentripplanner/geocoder": "^1.3.0",
|
|
17
17
|
"@styled-icons/foundation": "^10.34.0",
|
|
18
18
|
"@turf/along": "^6.0.1",
|
|
19
19
|
"bowser": "^2.7.0",
|
|
@@ -28,6 +28,6 @@
|
|
|
28
28
|
"tsc": "tsc"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
|
-
"@opentripplanner/types": "3.0.0
|
|
31
|
+
"@opentripplanner/types": "^3.0.0"
|
|
32
32
|
}
|
|
33
33
|
}
|
|
@@ -7,47 +7,57 @@ import {
|
|
|
7
7
|
|
|
8
8
|
const bikeRentalItinerary = require("./__mocks__/bike-rental-itinerary.json");
|
|
9
9
|
const tncItinerary = require("./__mocks__/tnc-itinerary.json");
|
|
10
|
-
// const multiCurrencyItinerary = require("./__mocks__/multi-currency-itinerary.json");
|
|
11
10
|
|
|
12
11
|
describe("util > itinerary", () => {
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
describe("isTransit", () => {
|
|
13
|
+
it("should work", () => {
|
|
14
|
+
expect(isTransit("CAR")).toBeFalsy();
|
|
15
|
+
expect(isTransit("BUS")).toBeTruthy();
|
|
16
|
+
});
|
|
15
17
|
});
|
|
16
18
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
describe("getCompanyFromLeg", () => {
|
|
20
|
+
it("should return company for bike rental leg", () => {
|
|
21
|
+
const company = getCompanyFromLeg(bikeRentalItinerary.legs[1]);
|
|
22
|
+
expect(company).toEqual("GBFS");
|
|
23
|
+
});
|
|
21
24
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
it("should return company for TNC leg", () => {
|
|
26
|
+
const company = getCompanyFromLeg(tncItinerary.legs[0]);
|
|
27
|
+
expect(company).toEqual("UBER");
|
|
28
|
+
});
|
|
25
29
|
});
|
|
26
30
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
31
|
+
describe("getTransitFare", () => {
|
|
32
|
+
it("should return defaults with missing fare", () => {
|
|
33
|
+
const { transitFare } = getTransitFare(null);
|
|
34
|
+
// transit fare value should be zero
|
|
35
|
+
expect(transitFare).toMatchSnapshot();
|
|
36
|
+
});
|
|
32
37
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
38
|
+
it("should work with valid fare component", () => {
|
|
39
|
+
const fareComponent = {
|
|
40
|
+
currency: {
|
|
41
|
+
currency: "USD",
|
|
42
|
+
defaultFractionDigits: 2,
|
|
43
|
+
currencyCode: "USD",
|
|
44
|
+
symbol: "$"
|
|
45
|
+
},
|
|
46
|
+
cents: 575
|
|
47
|
+
};
|
|
48
|
+
const { currencyCode, transitFare } = getTransitFare(fareComponent);
|
|
49
|
+
expect(currencyCode).toEqual(fareComponent.currency.currencyCode);
|
|
50
|
+
// Snapshot tests
|
|
51
|
+
expect(transitFare).toMatchSnapshot();
|
|
52
|
+
});
|
|
47
53
|
});
|
|
48
54
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
55
|
+
describe("calculateTncFares", () => {
|
|
56
|
+
it("should return the correct amounts and currency for an itinerary with TNC", () => {
|
|
57
|
+
const fareResult = calculateTncFares(tncItinerary, true);
|
|
58
|
+
expect(fareResult.currencyCode).toEqual("USD");
|
|
59
|
+
expect(fareResult.maxTNCFare).toEqual(19);
|
|
60
|
+
expect(fareResult.minTNCFare).toEqual(17);
|
|
61
|
+
});
|
|
52
62
|
});
|
|
53
63
|
});
|
package/src/itinerary.ts
CHANGED
|
@@ -13,32 +13,6 @@ import {
|
|
|
13
13
|
} from "@opentripplanner/types";
|
|
14
14
|
import turfAlong from "@turf/along";
|
|
15
15
|
|
|
16
|
-
/*
|
|
17
|
-
import {
|
|
18
|
-
// calculateFares,
|
|
19
|
-
// getLegModeLabel,
|
|
20
|
-
// getModeForPlace,
|
|
21
|
-
// getPlaceName,
|
|
22
|
-
// getStepDirection,
|
|
23
|
-
// getStepInstructions,
|
|
24
|
-
// getStepStreetName,
|
|
25
|
-
// getTimeZoneOffset,
|
|
26
|
-
// getTransitFare
|
|
27
|
-
} from "./deprecated";
|
|
28
|
-
|
|
29
|
-
export {
|
|
30
|
-
// calculateFares,
|
|
31
|
-
// getLegModeLabel,
|
|
32
|
-
// getModeForPlace,
|
|
33
|
-
// getPlaceName,
|
|
34
|
-
// getStepDirection,
|
|
35
|
-
// getStepInstructions,
|
|
36
|
-
// getStepStreetName,
|
|
37
|
-
// getTimeZoneOffset,
|
|
38
|
-
// getTransitFare
|
|
39
|
-
};
|
|
40
|
-
*/
|
|
41
|
-
|
|
42
16
|
// All OTP transit modes
|
|
43
17
|
export const transitModes = [
|
|
44
18
|
"TRAM",
|
|
@@ -455,24 +429,24 @@ export function calculatePhysicalActivity(
|
|
|
455
429
|
* It is assumed that the same currency is used for all TNC legs.
|
|
456
430
|
*/
|
|
457
431
|
export function calculateTncFares(itinerary: Itinerary): TncFare {
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
432
|
+
return itinerary.legs
|
|
433
|
+
.filter(leg => leg.mode === "CAR" && leg.hailedCar && leg.tncData)
|
|
434
|
+
.reduce(
|
|
435
|
+
({ maxTNCFare, minTNCFare }, { tncData }) => {
|
|
436
|
+
const { currency, maxCost, minCost } = tncData;
|
|
437
|
+
return {
|
|
438
|
+
// Assumes a single currency for entire itinerary.
|
|
439
|
+
currencyCode: currency,
|
|
440
|
+
maxTNCFare: maxTNCFare + maxCost,
|
|
441
|
+
minTNCFare: minTNCFare + minCost
|
|
442
|
+
};
|
|
443
|
+
},
|
|
444
|
+
{
|
|
445
|
+
currencyCode: null,
|
|
446
|
+
maxTNCFare: 0,
|
|
447
|
+
minTNCFare: 0
|
|
448
|
+
}
|
|
449
|
+
);
|
|
476
450
|
}
|
|
477
451
|
|
|
478
452
|
/**
|
|
@@ -485,17 +459,77 @@ export function getTransitFare(
|
|
|
485
459
|
currencyCode: string;
|
|
486
460
|
transitFare: number;
|
|
487
461
|
} {
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
462
|
+
return fareComponent
|
|
463
|
+
? {
|
|
464
|
+
currencyCode: fareComponent.currency.currencyCode,
|
|
465
|
+
transitFare: fareComponent.cents
|
|
466
|
+
}
|
|
467
|
+
: {
|
|
468
|
+
currencyCode: "USD",
|
|
469
|
+
transitFare: 0
|
|
470
|
+
};
|
|
471
|
+
}
|
|
472
|
+
|
|
473
|
+
/**
|
|
474
|
+
* Sources:
|
|
475
|
+
* - https://www.itf-oecd.org/sites/default/files/docs/environmental-performance-new-mobility.pdf
|
|
476
|
+
* - https://www.thrustcarbon.com/insights/how-to-calculate-emissions-from-a-ferry-journey
|
|
477
|
+
* - https://www.itf-oecd.org/sites/default/files/life-cycle-assessment-calculations-2020.xlsx
|
|
478
|
+
* Other values extrapolated.
|
|
479
|
+
*/
|
|
480
|
+
const CARBON_INTENSITY_DEFAULTS = {
|
|
481
|
+
walk: 0.026,
|
|
482
|
+
bicycle: 0.017,
|
|
483
|
+
car: 0.162,
|
|
484
|
+
tram: 0.066,
|
|
485
|
+
subway: 0.066,
|
|
486
|
+
rail: 0.066,
|
|
487
|
+
bus: 0.09,
|
|
488
|
+
ferry: 0.082,
|
|
489
|
+
cable_car: 0.021,
|
|
490
|
+
gondola: 0.021,
|
|
491
|
+
funicular: 0.066,
|
|
492
|
+
transit: 0.066,
|
|
493
|
+
leg_switch: 0,
|
|
494
|
+
airplane: 0.382,
|
|
495
|
+
micromobility: 0.095
|
|
496
|
+
};
|
|
497
|
+
|
|
498
|
+
/**
|
|
499
|
+
* @param {itinerary} itinerary OTP trip itinierary
|
|
500
|
+
* @param {carbonIntensity} carbonIntensity carbon intensity by mode in grams/meter
|
|
501
|
+
* @param {units} units units to be used in return value
|
|
502
|
+
* @return Amount of carbon in chosen unit
|
|
503
|
+
*/
|
|
504
|
+
export function calculateEmissions(
|
|
505
|
+
itinerary: Itinerary,
|
|
506
|
+
carbonIntensity: Record<string, number> = {},
|
|
507
|
+
units?: string
|
|
508
|
+
): number {
|
|
509
|
+
// Apply defaults for any values that we don't have.
|
|
510
|
+
const carbonIntensityWithDefaults = {
|
|
511
|
+
...CARBON_INTENSITY_DEFAULTS,
|
|
512
|
+
...carbonIntensity
|
|
500
513
|
};
|
|
514
|
+
|
|
515
|
+
// Distance is in meters, totalCarbon is in grams
|
|
516
|
+
const totalCarbon =
|
|
517
|
+
itinerary?.legs?.reduce((total, leg) => {
|
|
518
|
+
return (
|
|
519
|
+
(leg.distance * carbonIntensityWithDefaults[leg.mode.toLowerCase()] ||
|
|
520
|
+
0) + total
|
|
521
|
+
);
|
|
522
|
+
}, 0) || 0;
|
|
523
|
+
|
|
524
|
+
switch (units) {
|
|
525
|
+
case "ounce":
|
|
526
|
+
return totalCarbon / 28.35;
|
|
527
|
+
case "kilogram":
|
|
528
|
+
return totalCarbon / 1000;
|
|
529
|
+
case "pound":
|
|
530
|
+
return totalCarbon / 454;
|
|
531
|
+
case "gram":
|
|
532
|
+
default:
|
|
533
|
+
return totalCarbon;
|
|
534
|
+
}
|
|
501
535
|
}
|
package/src/map.ts
CHANGED
|
@@ -1,16 +1,4 @@
|
|
|
1
1
|
import { LatLngArray, Location, UserPosition } from "@opentripplanner/types";
|
|
2
|
-
import { toSentenceCase } from "./itinerary";
|
|
3
|
-
|
|
4
|
-
/*
|
|
5
|
-
import {
|
|
6
|
-
// coordsToString,
|
|
7
|
-
// getDetailText //,
|
|
8
|
-
// latlngToString,
|
|
9
|
-
// logDeprecationWarning
|
|
10
|
-
} from "./deprecated";
|
|
11
|
-
|
|
12
|
-
export { coordsToString, getDetailText , latlngToString };
|
|
13
|
-
*/
|
|
14
2
|
|
|
15
3
|
export function currentPositionToLocation(
|
|
16
4
|
currentPosition: UserPosition
|
|
@@ -28,8 +16,8 @@ export function currentPositionToLocation(
|
|
|
28
16
|
};
|
|
29
17
|
}
|
|
30
18
|
|
|
31
|
-
// TRICKY:
|
|
32
|
-
// otp-rr actions where the intl context is not available.
|
|
19
|
+
// TRICKY: This method is used in query.js and in the context of
|
|
20
|
+
// otp-rr actions where the intl context is not available/does not apply.
|
|
33
21
|
export function coordsToString(coords: number[]): string {
|
|
34
22
|
return coords.length && coords.map(c => (+c).toFixed(5)).join(", ");
|
|
35
23
|
}
|
|
@@ -48,12 +36,6 @@ export function constructLocation(latlng: {
|
|
|
48
36
|
};
|
|
49
37
|
}
|
|
50
38
|
|
|
51
|
-
export function formatStoredPlaceName(location: Location): string {
|
|
52
|
-
return location.type === "home" || location.type === "work"
|
|
53
|
-
? toSentenceCase(location.type)
|
|
54
|
-
: location.name;
|
|
55
|
-
}
|
|
56
|
-
|
|
57
39
|
export function matchLatLon(location1: Location, location2: Location): boolean {
|
|
58
40
|
if (!location1 || !location2) return location1 === location2;
|
|
59
41
|
return location1.lat === location2.lat && location1.lon === location2.lon;
|
package/src/query.js
CHANGED
|
@@ -8,14 +8,10 @@ import queryParams from "./query-params";
|
|
|
8
8
|
import {
|
|
9
9
|
getCurrentTime,
|
|
10
10
|
getCurrentDate,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
OTP_API_DATE_FORMAT,
|
|
12
|
+
OTP_API_TIME_FORMAT
|
|
13
13
|
} from "./time";
|
|
14
14
|
|
|
15
|
-
// import { coordsToString, summarizeQuery } from "./deprecated";
|
|
16
|
-
|
|
17
|
-
// export { summarizeQuery };
|
|
18
|
-
|
|
19
15
|
/* The list of default parameters considered in the settings panel */
|
|
20
16
|
|
|
21
17
|
export const defaultParams = [
|
|
@@ -148,7 +144,9 @@ function isParamApplicable(paramInfo, query, config) {
|
|
|
148
144
|
* Helper method which replaces OTP flex modes with single FLEX mode that's
|
|
149
145
|
* more useful and easier to work with.
|
|
150
146
|
*/
|
|
151
|
-
export function reduceOtpFlexModes(modes) {
|
|
147
|
+
export function reduceOtpFlexModes(modes, enabled = true) {
|
|
148
|
+
if (!enabled) return modes;
|
|
149
|
+
|
|
152
150
|
return modes.reduce((prev, cur) => {
|
|
153
151
|
const newModes = prev;
|
|
154
152
|
// Add the current mode if it is not a flex mode
|
|
@@ -191,7 +189,10 @@ export function expandOtpFlexMode(mode) {
|
|
|
191
189
|
* default values.
|
|
192
190
|
*/
|
|
193
191
|
export function isNotDefaultQuery(query, config) {
|
|
194
|
-
const activeModes = reduceOtpFlexModes(
|
|
192
|
+
const activeModes = reduceOtpFlexModes(
|
|
193
|
+
query.mode.split(",").sort(),
|
|
194
|
+
config.modes?.mergeFlex
|
|
195
|
+
);
|
|
195
196
|
if (
|
|
196
197
|
activeModes.length !== 2 ||
|
|
197
198
|
activeModes[0] !== "TRANSIT" ||
|
|
@@ -427,7 +428,7 @@ export function getRoutingParams(config, currentQuery, ignoreRealtimeUpdates) {
|
|
|
427
428
|
}
|
|
428
429
|
|
|
429
430
|
// check date/time validity; ignore both if either is invalid
|
|
430
|
-
const dateValid = isMatch(params.date,
|
|
431
|
+
const dateValid = isMatch(params.date, OTP_API_DATE_FORMAT);
|
|
431
432
|
const timeValid = isMatch(params.time, OTP_API_TIME_FORMAT);
|
|
432
433
|
|
|
433
434
|
if (!dateValid || !timeValid) {
|
|
@@ -470,7 +471,8 @@ export function getRoutingParams(config, currentQuery, ignoreRealtimeUpdates) {
|
|
|
470
471
|
}
|
|
471
472
|
|
|
472
473
|
// Replace FLEX placeholder with OTP flex modes
|
|
473
|
-
|
|
474
|
+
// Explicit false check allows avoiding a breaking change -- undefined is true
|
|
475
|
+
if (params.mode && config.modes?.mergeFlex !== false) {
|
|
474
476
|
// Ensure query is in reduced format to avoid replacing twice
|
|
475
477
|
const reducedMode = reduceOtpFlexModes(params.mode.split(",")).join(",");
|
|
476
478
|
params.mode = expandOtpFlexMode(reducedMode);
|
package/src/time.ts
CHANGED
|
@@ -2,12 +2,9 @@ import { Config } from "@opentripplanner/types";
|
|
|
2
2
|
import { startOfDay, add, format } from "date-fns";
|
|
3
3
|
import { utcToZonedTime } from "date-fns-tz";
|
|
4
4
|
|
|
5
|
-
//
|
|
6
|
-
//
|
|
7
|
-
export const OTP_API_DATE_FORMAT = "
|
|
8
|
-
// Date-Fns uses a different string format than moment.js
|
|
9
|
-
// see https://github.com/date-fns/date-fns/blob/master/docs/unicodeTokens.md
|
|
10
|
-
export const OTP_API_DATE_FORMAT_DATE_FNS = "yyyy-MM-dd";
|
|
5
|
+
// Date/time formats (per date-fns) when sending/receiving date from OTP
|
|
6
|
+
// regardless of whatever the user has configured as the display format.
|
|
7
|
+
export const OTP_API_DATE_FORMAT = "yyyy-MM-dd";
|
|
11
8
|
export const OTP_API_TIME_FORMAT = "HH:mm";
|
|
12
9
|
|
|
13
10
|
/**
|
|
@@ -89,8 +86,5 @@ export function getCurrentTime(timezone = getUserTimezone()): string {
|
|
|
89
86
|
* The conversion to the user's timezone is needed for testing purposes.
|
|
90
87
|
*/
|
|
91
88
|
export function getCurrentDate(timezone = getUserTimezone()): string {
|
|
92
|
-
return format(
|
|
93
|
-
utcToZonedTime(Date.now(), timezone),
|
|
94
|
-
OTP_API_DATE_FORMAT_DATE_FNS
|
|
95
|
-
);
|
|
89
|
+
return format(utcToZonedTime(Date.now(), timezone), OTP_API_DATE_FORMAT);
|
|
96
90
|
}
|