@opentripplanner/core-utils 13.0.0-alpha.1 → 13.0.0-alpha.3
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/LICENSE +21 -0
- package/README.md +3 -0
- package/esm/graphql.d.js.map +1 -1
- package/esm/index.js.map +1 -1
- package/esm/itinerary.js +78 -115
- package/esm/itinerary.js.map +1 -1
- package/esm/map.js +3 -3
- package/esm/map.js.map +1 -1
- package/esm/profile.js +17 -18
- package/esm/profile.js.map +1 -1
- package/esm/query-gen.js +35 -45
- package/esm/query-gen.js.map +1 -1
- package/esm/query.js +135 -191
- package/esm/query.js.map +1 -1
- package/esm/route.js +74 -97
- package/esm/route.js.map +1 -1
- package/esm/storage.js +4 -5
- package/esm/storage.js.map +1 -1
- package/esm/suspense.js +1 -3
- package/esm/suspense.js.map +1 -1
- package/esm/time.js +13 -17
- package/esm/time.js.map +1 -1
- package/esm/ui.js +0 -5
- package/esm/ui.js.map +1 -1
- package/lib/graphql.d.js.map +1 -1
- package/lib/index.js +3 -19
- package/lib/index.js.map +1 -1
- package/lib/itinerary.js +114 -199
- package/lib/itinerary.js.map +1 -1
- package/lib/map.d.ts +1 -1
- package/lib/map.d.ts.map +1 -1
- package/lib/map.js +9 -20
- package/lib/map.js.map +1 -1
- package/lib/profile.js +17 -19
- package/lib/profile.js.map +1 -1
- package/lib/query-gen.d.ts +4 -4
- package/lib/query-gen.d.ts.map +1 -1
- package/lib/query-gen.js +34 -45
- package/lib/query-gen.js.map +1 -1
- package/lib/query-params.jsx +893 -0
- package/lib/query.js +66 -118
- package/lib/query.js.map +1 -1
- package/lib/route.js +73 -101
- package/lib/route.js.map +1 -1
- package/lib/storage.js +6 -11
- package/lib/storage.js.map +1 -1
- package/lib/suspense.d.ts +1 -1
- package/lib/suspense.d.ts.map +1 -1
- package/lib/suspense.js +3 -9
- package/lib/suspense.js.map +1 -1
- package/lib/time.js +19 -38
- package/lib/time.js.map +1 -1
- package/lib/ui.js +1 -8
- package/lib/ui.js.map +1 -1
- package/package.json +7 -8
- package/src/query-params.jsx +893 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/esm/query-params.js +0 -786
- package/esm/query-params.js.map +0 -1
- package/lib/query-params.js +0 -756
- package/lib/query-params.js.map +0 -1
- /package/{src/query-params.js → esm/query-params.jsx} +0 -0
package/esm/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/query.js"],"names":["format","isMatch","parse","getGeocoder","qs","getTransitModes","hasCar","isAccessMode","coordsToString","stringToCoords","queryParams","getCurrentTime","getCurrentDate","OTP_API_DATE_FORMAT","OTP_API_TIME_FORMAT","defaultParams","TIME_FORMATS","getQueryParamProperty","paramInfo","property","query","ensureSingleAccessMode","queryModes","accessCount","filter","m","length","firstAccess","find","push","getUrlParams","window","location","href","split","undefined","getOtpUrlParams","Object","keys","key","startsWith","getTripOptionsFromQuery","keepPlace","options","time","departArrive","date","from","to","getDefaultQueryParamValue","param","getDefaultQuery","config","defaultQuery","routingType","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","geocoderMethod","geocoder","then","result","firstResult","features","getLocationFromGeocodedFeature","parseLocationString","parts","coordinates","lat","lon","queryParamToLocation","autoMethod","planParamsToQuery","params","fromPlace","toPlace","arriveBy","matchedTimeFormat","timeFormat","Date","intermediatePlaces","maybeNumber","Number","isNaN","planParamsToQueryAsync","getRoutingParams","currentQuery","ignoreRealtimeUpdates","isItinerary","indexOf","rewriteFunction","itineraryRewrite","profileRewrite","assign","dateValid","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 * @param {string} geocoderMethod - an alternate geocoder api method to use. Defaults to `search`\n * @return {Location}\n */\nasync function getFirstGeocodeResult(\n text,\n geocoderConfig,\n geocoderMethod = \"search\"\n) {\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[geocoderMethod]({ 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(\n value,\n geocoderConfig,\n geocoderConfig.autoMethod\n );\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,"file":"query.js","names":["format","isMatch","parse","getGeocoder","qs","getTransitModes","hasCar","isAccessMode","coordsToString","stringToCoords","queryParams","getCurrentTime","getCurrentDate","OTP_API_DATE_FORMAT","OTP_API_TIME_FORMAT","defaultParams","TIME_FORMATS","getQueryParamProperty","paramInfo","property","query","ensureSingleAccessMode","queryModes","accessCount","filter","m","length","firstAccess","find","push","getUrlParams","window","location","href","split","undefined","getOtpUrlParams","Object","keys","key","startsWith","getTripOptionsFromQuery","keepPlace","arguments","options","_objectSpread","time","departArrive","date","from","to","getDefaultQueryParamValue","param","getDefaultQuery","config","defaultQuery","routingType","qp","forEach","name","routingTypes","defaultQueryParams","isParamApplicable","applicable","includes","reduceOtpFlexModes","modes","enabled","reduce","prev","cur","newModes","expandOtpFlexMode","mode","map","join","isNotDefaultQuery","_config$modes","activeModes","sort","mergeFlex","defaultModes","concat","modesEqual","every","value","index","_loop","i","v","_ret","getFirstGeocodeResult","_x","_x2","_getFirstGeocodeResult","apply","_asyncToGenerator","_regeneratorRuntime","mark","_callee","text","geocoderConfig","geocoderMethod","geocoder","_args","wrap","_callee$","_context","next","abrupt","then","result","firstResult","features","getLocationFromGeocodedFeature","stop","parseLocationString","parts","coordinates","lat","lon","queryParamToLocation","_x3","_x4","_queryParamToLocation","_callee2","_callee2$","_context2","autoMethod","sent","planParamsToQuery","params","fromPlace","toPlace","arriveBy","matchedTimeFormat","timeFormat","Date","intermediatePlaces","maybeNumber","Number","isNaN","planParamsToQueryAsync","_x5","_planParamsToQueryAsync","_callee3","_args3","_callee3$","_context3","getRoutingParams","currentQuery","ignoreRealtimeUpdates","_config$modes2","isItinerary","indexOf","rewriteFunction","itineraryRewrite","profileRewrite","assign","_defineProperty","dateValid","timeValid","minTransitDistance","searchTimeout","onlyTransitTrips","startTimeValid","startTime","endTimeValid","endTime","reducedMode"],"sources":["../src/query.js"],"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 * @param {string} geocoderMethod - an alternate geocoder api method to use. Defaults to `search`\n * @return {Location}\n */\nasync function getFirstGeocodeResult(\n text,\n geocoderConfig,\n geocoderMethod = \"search\"\n) {\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[geocoderMethod]({ 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(\n value,\n geocoderConfig,\n geocoderConfig.autoMethod\n );\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"],"mappings":"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","ignoreList":[]}
|
package/esm/route.js
CHANGED
|
@@ -11,12 +11,12 @@ import chroma from "chroma-js";
|
|
|
11
11
|
* @return {object} The transitOperator if a match was found or null if no match
|
|
12
12
|
* was found
|
|
13
13
|
*/
|
|
14
|
-
|
|
15
14
|
export function getTransitOperatorFromFeedIdAndAgencyId(feedId, agencyId, transitOperators) {
|
|
16
15
|
return transitOperators.find(function (transitOperator) {
|
|
17
16
|
return transitOperator.feedId === feedId && transitOperator.agencyId === agencyId;
|
|
18
17
|
}) || null;
|
|
19
18
|
}
|
|
19
|
+
|
|
20
20
|
/**
|
|
21
21
|
* Looks up an operator from the provided leg.
|
|
22
22
|
*
|
|
@@ -25,12 +25,12 @@ export function getTransitOperatorFromFeedIdAndAgencyId(feedId, agencyId, transi
|
|
|
25
25
|
* @param {object} transitOperators transitOperators from config.
|
|
26
26
|
* @return {object} the operator if one was found or null if no match was found
|
|
27
27
|
*/
|
|
28
|
-
|
|
29
28
|
export function getTransitOperatorFromLeg(leg, transitOperators) {
|
|
30
29
|
if (!leg.routeId || !leg.agencyId) return null;
|
|
31
30
|
var feedId = leg.routeId.split(":")[0];
|
|
32
31
|
return getTransitOperatorFromFeedIdAndAgencyId(feedId, leg.agencyId, transitOperators);
|
|
33
32
|
}
|
|
33
|
+
|
|
34
34
|
/**
|
|
35
35
|
* Looks up an operator from the provided configuration given an OTP route.
|
|
36
36
|
* NOTE: this assumes the use of the OTP Route model or a modified OTP
|
|
@@ -41,12 +41,10 @@ export function getTransitOperatorFromLeg(leg, transitOperators) {
|
|
|
41
41
|
* @param {array} transitOperators transitOperators from config
|
|
42
42
|
* @return {object} the operator if one was found or null if no match was found
|
|
43
43
|
*/
|
|
44
|
-
|
|
45
44
|
export function getTransitOperatorFromOtpRoute(route, transitOperators) {
|
|
46
45
|
if (!route.id) return null;
|
|
47
46
|
var feedId = route.id.split(":")[0];
|
|
48
47
|
var agencyId;
|
|
49
|
-
|
|
50
48
|
if (route.agency) {
|
|
51
49
|
// This is returned in the OTP Route model
|
|
52
50
|
agencyId = route.agency.id;
|
|
@@ -56,9 +54,10 @@ export function getTransitOperatorFromOtpRoute(route, transitOperators) {
|
|
|
56
54
|
} else {
|
|
57
55
|
return null;
|
|
58
56
|
}
|
|
59
|
-
|
|
60
57
|
return getTransitOperatorFromFeedIdAndAgencyId(feedId, agencyId, transitOperators);
|
|
61
|
-
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
// The functions below are for enhanced route sorting functions for the route
|
|
62
61
|
// viewer on OTP-react-redux.
|
|
63
62
|
// They address route ordering issues discussed in
|
|
64
63
|
// https://github.com/opentripplanner/otp-react-redux/pull/123 and
|
|
@@ -68,8 +67,8 @@ export function getTransitOperatorFromOtpRoute(route, transitOperators) {
|
|
|
68
67
|
* A large comparator value that can safely be used in mathematical sort
|
|
69
68
|
* comparisons to place things at the end of lists
|
|
70
69
|
*/
|
|
71
|
-
|
|
72
70
|
var END_OF_LIST_COMPARATOR_VALUE = 999999999999;
|
|
71
|
+
|
|
73
72
|
/**
|
|
74
73
|
* Returns a transit operator comparator value given a route and an optional
|
|
75
74
|
* transitOperators config value. This function will do its best to handle all
|
|
@@ -83,61 +82,57 @@ var END_OF_LIST_COMPARATOR_VALUE = 999999999999;
|
|
|
83
82
|
* the transitOperators value is not defined. Otherwise an integer will be
|
|
84
83
|
* returned.
|
|
85
84
|
*/
|
|
86
|
-
|
|
87
85
|
function getTransitOperatorComparatorValue(route, transitOperators) {
|
|
88
86
|
// if the transitOperators is undefined or has zero length, use the route's
|
|
89
87
|
// agency name as the comparator value
|
|
90
88
|
if (!transitOperators || transitOperators.length === 0) {
|
|
91
89
|
// OTP Route
|
|
92
|
-
if (route.agency) return route.agency.name;
|
|
93
|
-
|
|
94
|
-
if (route.agencyName) return route.agencyName;
|
|
95
|
-
|
|
90
|
+
if (route.agency) return route.agency.name;
|
|
91
|
+
// OTP RouteShort (base OTP repo or IBI fork)
|
|
92
|
+
if (route.agencyName) return route.agencyName;
|
|
93
|
+
// shouldn't happen as agency names will be defined
|
|
96
94
|
return "zzz";
|
|
97
|
-
}
|
|
95
|
+
}
|
|
98
96
|
|
|
97
|
+
// find operator associated with route
|
|
98
|
+
var transitOperator = getTransitOperatorFromOtpRoute(route, transitOperators);
|
|
99
99
|
|
|
100
|
-
|
|
100
|
+
// if transit operator not found, return infinity
|
|
101
|
+
if (!transitOperator) return END_OF_LIST_COMPARATOR_VALUE;
|
|
101
102
|
|
|
102
|
-
|
|
103
|
+
// return the transit operator's sort value or END_OF_LIST_COMPARATOR_VALUE if
|
|
103
104
|
// the sort value is not a number
|
|
104
|
-
|
|
105
105
|
return typeof transitOperator.order === "number" ? transitOperator.order : END_OF_LIST_COMPARATOR_VALUE;
|
|
106
106
|
}
|
|
107
|
+
|
|
107
108
|
/**
|
|
108
109
|
* Calculates the sort comparator value given two routes based off of the
|
|
109
110
|
* route's agency and provided transitOperators config data.
|
|
110
111
|
*/
|
|
111
|
-
|
|
112
|
-
|
|
113
112
|
function makeTransitOperatorComparator(transitOperators) {
|
|
114
113
|
return function (a, b) {
|
|
115
114
|
var aVal = getTransitOperatorComparatorValue(a, transitOperators);
|
|
116
115
|
var bVal = getTransitOperatorComparatorValue(b, transitOperators);
|
|
117
|
-
|
|
118
116
|
if (typeof aVal === "string") {
|
|
119
117
|
// happens when transitOperators is undefined. Both aVal are guaranteed to
|
|
120
118
|
// be strings. Make a string comparison.
|
|
121
119
|
if (aVal < bVal) return -1;
|
|
122
120
|
if (aVal > bVal) return 1;
|
|
123
121
|
return 0;
|
|
124
|
-
}
|
|
122
|
+
}
|
|
123
|
+
// @ts-expect-error transitOperators are defined and therefore a numeric value is guaranteed
|
|
125
124
|
// to be returned
|
|
126
|
-
|
|
127
|
-
|
|
128
125
|
return aVal - bVal;
|
|
129
126
|
};
|
|
130
127
|
}
|
|
128
|
+
|
|
131
129
|
/**
|
|
132
130
|
* Gets the desired sort values according to an optional getter function. If the
|
|
133
131
|
* getter function is not defined, the original sort values are returned.
|
|
134
132
|
*/
|
|
135
|
-
|
|
136
|
-
|
|
137
133
|
function getSortValues(getterFn, a, b) {
|
|
138
134
|
var aVal;
|
|
139
135
|
var bVal;
|
|
140
|
-
|
|
141
136
|
if (typeof getterFn === "function") {
|
|
142
137
|
aVal = getterFn(a);
|
|
143
138
|
bVal = getterFn(b);
|
|
@@ -145,16 +140,15 @@ function getSortValues(getterFn, a, b) {
|
|
|
145
140
|
aVal = a;
|
|
146
141
|
bVal = b;
|
|
147
142
|
}
|
|
148
|
-
|
|
149
143
|
return {
|
|
150
144
|
aVal: aVal,
|
|
151
145
|
bVal: bVal
|
|
152
146
|
};
|
|
153
|
-
}
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
// Lookup for the sort values associated with various OTP modes.
|
|
154
150
|
// Note: JSDoc format not used to avoid bug in documentationjs.
|
|
155
151
|
// https://github.com/documentationjs/documentation/issues/372
|
|
156
|
-
|
|
157
|
-
|
|
158
152
|
var modeComparatorValue = {
|
|
159
153
|
SUBWAY: 1,
|
|
160
154
|
TRAM: 2,
|
|
@@ -165,10 +159,11 @@ var modeComparatorValue = {
|
|
|
165
159
|
CABLE_CAR: 6,
|
|
166
160
|
FUNICULAR: 7,
|
|
167
161
|
BUS: 8
|
|
168
|
-
};
|
|
162
|
+
};
|
|
163
|
+
|
|
164
|
+
// Lookup that maps route types to the OTP mode sort values.
|
|
169
165
|
// Note: JSDoc format not used to avoid bug in documentationjs.
|
|
170
166
|
// https://github.com/documentationjs/documentation/issues/372
|
|
171
|
-
|
|
172
167
|
var routeTypeComparatorValue = {
|
|
173
168
|
0: modeComparatorValue.TRAM,
|
|
174
169
|
// - Tram, Streetcar, Light rail.
|
|
@@ -193,77 +188,70 @@ var routeTypeComparatorValue = {
|
|
|
193
188
|
12: modeComparatorValue.RAIL,
|
|
194
189
|
// - Monorail.
|
|
195
190
|
13: modeComparatorValue.TROLLEYBUS
|
|
196
|
-
};
|
|
191
|
+
};
|
|
192
|
+
|
|
193
|
+
// Gets a comparator value for a given route's type (OTP mode).
|
|
197
194
|
// Note: JSDoc format not used to avoid bug in documentationjs.
|
|
198
195
|
// ttps://github.com/documentationjs/documentation/issues/372
|
|
199
|
-
|
|
200
196
|
function getRouteTypeComparatorValue(route) {
|
|
201
197
|
// For some strange reason, the short route response in OTP returns the
|
|
202
198
|
// string-based modes, but the long route response returns the
|
|
203
199
|
// integer route type. This attempts to account for both of those cases.
|
|
204
200
|
if (!route) throw new Error("Route is undefined. ".concat(route));
|
|
205
|
-
|
|
206
201
|
if (typeof modeComparatorValue[route.mode] !== "undefined") {
|
|
207
202
|
return modeComparatorValue[route.mode];
|
|
208
203
|
}
|
|
209
|
-
|
|
210
204
|
if (typeof routeTypeComparatorValue[route.type] !== "undefined") {
|
|
211
205
|
return routeTypeComparatorValue[route.type];
|
|
212
|
-
}
|
|
206
|
+
}
|
|
207
|
+
// Default the comparator value to a large number (placing the route at the
|
|
213
208
|
// end of the list).
|
|
214
209
|
// eslint-disable-next-line no-console
|
|
215
|
-
|
|
216
|
-
|
|
217
210
|
console.warn("no mode/route type found for route", route);
|
|
218
211
|
return END_OF_LIST_COMPARATOR_VALUE;
|
|
219
212
|
}
|
|
213
|
+
|
|
220
214
|
/**
|
|
221
215
|
* Calculates the sort comparator value given two routes based off of route type
|
|
222
216
|
* (OTP mode).
|
|
223
217
|
*/
|
|
224
|
-
|
|
225
|
-
|
|
226
218
|
function routeTypeComparator(a, b) {
|
|
227
219
|
return getRouteTypeComparatorValue(a) - getRouteTypeComparatorValue(b);
|
|
228
220
|
}
|
|
221
|
+
|
|
229
222
|
/**
|
|
230
223
|
* Determines whether a value is a string that starts with an alphabetic
|
|
231
224
|
* ascii character.
|
|
232
225
|
*/
|
|
233
|
-
|
|
234
|
-
|
|
235
226
|
function startsWithAlphabeticCharacter(val) {
|
|
236
227
|
if (typeof val === "string" && val.length > 0) {
|
|
237
228
|
var firstCharCode = val.charCodeAt(0);
|
|
238
229
|
return firstCharCode >= 65 && firstCharCode <= 90 || firstCharCode >= 97 && firstCharCode <= 122;
|
|
239
230
|
}
|
|
240
|
-
|
|
241
231
|
return false;
|
|
242
232
|
}
|
|
233
|
+
|
|
243
234
|
/**
|
|
244
235
|
* Sorts routes based off of whether the shortName begins with an alphabetic
|
|
245
236
|
* character. Routes with shortn that do start with an alphabetic character will
|
|
246
237
|
* be prioritized over those that don't.
|
|
247
238
|
*/
|
|
248
|
-
|
|
249
|
-
|
|
250
239
|
function alphabeticShortNameComparator(a, b) {
|
|
251
240
|
var aStartsWithAlphabeticCharacter = startsWithAlphabeticCharacter(a.shortName);
|
|
252
241
|
var bStartsWithAlphabeticCharacter = startsWithAlphabeticCharacter(b.shortName);
|
|
253
|
-
|
|
254
242
|
if (aStartsWithAlphabeticCharacter && bStartsWithAlphabeticCharacter) {
|
|
255
243
|
// both start with an alphabetic character, return equivalence
|
|
256
244
|
return 0;
|
|
257
|
-
}
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
245
|
+
}
|
|
246
|
+
// a does start with an alphabetic character, but b does not. Prioritize a
|
|
247
|
+
if (aStartsWithAlphabeticCharacter) return -1;
|
|
248
|
+
// b does start with an alphabetic character, but a does not. Prioritize b
|
|
249
|
+
if (bStartsWithAlphabeticCharacter) return 1;
|
|
250
|
+
// neither route has a shortName that starts with an alphabetic character.
|
|
263
251
|
// Return equivalence
|
|
264
|
-
|
|
265
252
|
return 0;
|
|
266
253
|
}
|
|
254
|
+
|
|
267
255
|
/**
|
|
268
256
|
* Checks whether an appropriate comparison of numeric values can be made for
|
|
269
257
|
* sorting purposes. If both values are not valid numbers according to the
|
|
@@ -283,28 +271,26 @@ function alphabeticShortNameComparator(a, b) {
|
|
|
283
271
|
* @param {function} [objGetterFn] An optional function to obtain the
|
|
284
272
|
* comparison value from the comparator function arguments
|
|
285
273
|
*/
|
|
286
|
-
|
|
287
|
-
|
|
288
274
|
export function makeNumericValueComparator(objGetterFn) {
|
|
289
275
|
/* Note: Using the global version of isNaN (the Number version behaves differently. */
|
|
290
|
-
|
|
291
276
|
/* eslint-disable no-restricted-globals */
|
|
292
277
|
return function (a, b) {
|
|
293
278
|
var _getSortValues = getSortValues(objGetterFn, a, b),
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
if (isNaN(aVal) && isNaN(bVal)) return 0;
|
|
300
|
-
|
|
301
|
-
if (isNaN(aVal)) return 1;
|
|
302
|
-
|
|
303
|
-
if (isNaN(bVal)) return -1;
|
|
304
|
-
|
|
279
|
+
aVal = _getSortValues.aVal,
|
|
280
|
+
bVal = _getSortValues.bVal;
|
|
281
|
+
if (typeof aVal !== "number" || typeof bVal !== "number") return 0;
|
|
282
|
+
|
|
283
|
+
// if both values aren't valid numbers, use the next sort criteria
|
|
284
|
+
if (isNaN(aVal) && isNaN(bVal)) return 0;
|
|
285
|
+
// b is a valid number, b gets priority
|
|
286
|
+
if (isNaN(aVal)) return 1;
|
|
287
|
+
// a is a valid number, a gets priority
|
|
288
|
+
if (isNaN(bVal)) return -1;
|
|
289
|
+
// a and b are valid numbers, return the sort value
|
|
305
290
|
return aVal - bVal;
|
|
306
291
|
};
|
|
307
292
|
}
|
|
293
|
+
|
|
308
294
|
/**
|
|
309
295
|
* Create a comparator function that compares string values. The comparison
|
|
310
296
|
* values feed to the sort comparator function are assumed to be objects that
|
|
@@ -315,25 +301,24 @@ export function makeNumericValueComparator(objGetterFn) {
|
|
|
315
301
|
* @param {function} [objGetterFn] An optional function to obtain the
|
|
316
302
|
* comparison value from the comparator function arguments
|
|
317
303
|
*/
|
|
318
|
-
|
|
319
304
|
export function makeStringValueComparator(objGetterFn) {
|
|
320
305
|
return function (a, b) {
|
|
321
306
|
var _getSortValues2 = getSortValues(objGetterFn, a, b),
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
307
|
+
aVal = _getSortValues2.aVal,
|
|
308
|
+
bVal = _getSortValues2.bVal;
|
|
309
|
+
// both a and b are uncomparable strings, return equivalent value
|
|
310
|
+
if (!aVal && !bVal) return 0;
|
|
311
|
+
// a is not a comparable string, b gets priority
|
|
312
|
+
if (!aVal) return 1;
|
|
313
|
+
// b is not a comparable string, a gets priority
|
|
314
|
+
if (!bVal) return -1;
|
|
315
|
+
// a and b are comparable strings, return the sort value
|
|
332
316
|
if (aVal < bVal) return -1;
|
|
333
317
|
if (aVal > bVal) return 1;
|
|
334
318
|
return 0;
|
|
335
319
|
};
|
|
336
320
|
}
|
|
321
|
+
|
|
337
322
|
/**
|
|
338
323
|
* OpenTripPlanner sets the routeSortOrder to -999 by default. So, if that value
|
|
339
324
|
* is encountered, assume that it actually means that the routeSortOrder is not
|
|
@@ -342,10 +327,10 @@ export function makeStringValueComparator(objGetterFn) {
|
|
|
342
327
|
* See https://github.com/opentripplanner/OpenTripPlanner/issues/2938
|
|
343
328
|
* Also see https://github.com/opentripplanner/otp-react-redux/issues/122
|
|
344
329
|
*/
|
|
345
|
-
|
|
346
330
|
function getRouteSortOrderValue(val) {
|
|
347
331
|
return val === -999 ? undefined : val;
|
|
348
332
|
}
|
|
333
|
+
|
|
349
334
|
/**
|
|
350
335
|
* Create a multi-criteria sort comparator function composed of other sort
|
|
351
336
|
* comparator functions. Each comparator function will be ran in the order given
|
|
@@ -353,26 +338,23 @@ function getRouteSortOrderValue(val) {
|
|
|
353
338
|
* returned. If all comparison functions return equivalence, then the values
|
|
354
339
|
* are assumed to be equivalent.
|
|
355
340
|
*/
|
|
356
|
-
|
|
357
|
-
|
|
358
341
|
function makeMultiCriteriaSort() {
|
|
359
342
|
for (var _len = arguments.length, criteria = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
360
343
|
criteria[_key] = arguments[_key];
|
|
361
344
|
}
|
|
362
|
-
|
|
363
345
|
return function (a, b) {
|
|
364
346
|
for (var i = 0; i < criteria.length; i++) {
|
|
365
|
-
var curCriteriaComparatorValue = criteria[i](a, b);
|
|
347
|
+
var curCriteriaComparatorValue = criteria[i](a, b);
|
|
348
|
+
// if the comparison objects are not equivalent, return the value obtained
|
|
366
349
|
// in this current criteria comparison
|
|
367
|
-
|
|
368
350
|
if (curCriteriaComparatorValue !== 0) {
|
|
369
351
|
return curCriteriaComparatorValue;
|
|
370
352
|
}
|
|
371
353
|
}
|
|
372
|
-
|
|
373
354
|
return 0;
|
|
374
355
|
};
|
|
375
356
|
}
|
|
357
|
+
|
|
376
358
|
/**
|
|
377
359
|
* Creates a sort comparator function to compares routes for the purposes of
|
|
378
360
|
* sorting and displaying in a user interface. This takes in a single optional
|
|
@@ -404,8 +386,6 @@ function makeMultiCriteriaSort() {
|
|
|
404
386
|
* those with shortNames.
|
|
405
387
|
* 7. longName as string.
|
|
406
388
|
*/
|
|
407
|
-
|
|
408
|
-
|
|
409
389
|
export function makeRouteComparator(transitOperators) {
|
|
410
390
|
return makeMultiCriteriaSort(makeTransitOperatorComparator(transitOperators), makeNumericValueComparator(function (obj) {
|
|
411
391
|
return getRouteSortOrderValue(obj.sortOrder);
|
|
@@ -417,6 +397,7 @@ export function makeRouteComparator(transitOperators) {
|
|
|
417
397
|
return obj.longName;
|
|
418
398
|
}));
|
|
419
399
|
}
|
|
400
|
+
|
|
420
401
|
/**
|
|
421
402
|
* Tests if a pair of colors is readable. If it is, that readable color is returned.
|
|
422
403
|
* If it is not, a more appropriate alternative is returned.
|
|
@@ -430,31 +411,27 @@ export function makeRouteComparator(transitOperators) {
|
|
|
430
411
|
* @param backgroundColor A hex string, usually the "routeColor"
|
|
431
412
|
* @param proposedTextColor A hex string, usually the "routeTextColor"
|
|
432
413
|
*/
|
|
433
|
-
|
|
434
414
|
export function getMostReadableTextColor(backgroundColor, proposedTextColor) {
|
|
435
415
|
// Sometimes input will defy the method signature. Therefore we need extra fallbacks
|
|
436
416
|
if (!backgroundColor) backgroundColor = "#333333";
|
|
437
417
|
if (!proposedTextColor) proposedTextColor = "#ffffff";
|
|
438
|
-
|
|
439
418
|
if (!backgroundColor.startsWith("#")) {
|
|
440
419
|
backgroundColor = "#".concat(backgroundColor);
|
|
441
420
|
}
|
|
442
|
-
|
|
443
421
|
if (!proposedTextColor.startsWith("#")) {
|
|
444
422
|
proposedTextColor = "#".concat(proposedTextColor);
|
|
445
|
-
}
|
|
446
|
-
// Luminance thresholds have been selected based on actual transit agency colors
|
|
447
|
-
|
|
423
|
+
}
|
|
448
424
|
|
|
425
|
+
// Check if proposed color is readable
|
|
426
|
+
// Luminance thresholds have been selected based on actual transit agency colors
|
|
449
427
|
var fgLuminance = chroma(proposedTextColor).luminance();
|
|
450
428
|
var bgLuminance = chroma(backgroundColor).luminance();
|
|
451
|
-
|
|
452
429
|
if (bgLuminance + fgLuminance < 1.41 && bgLuminance + fgLuminance > 0.25 && Math.abs(bgLuminance - fgLuminance) > 0.2) {
|
|
453
430
|
return proposedTextColor;
|
|
454
|
-
}
|
|
455
|
-
// When generating colors, white is preferred.
|
|
456
|
-
|
|
431
|
+
}
|
|
457
432
|
|
|
433
|
+
// Return black or white based on luminance of background color
|
|
434
|
+
// When generating colors, white is preferred.
|
|
458
435
|
return chroma(backgroundColor).luminance() < 0.4 ? "#ffffff" : "#000000";
|
|
459
436
|
}
|
|
460
437
|
//# sourceMappingURL=route.js.map
|