-
Notifications
You must be signed in to change notification settings - Fork 59
acceptableValidModeCombos configuration #1366
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
308a3cc
Creates a set of valid combos and introduces strictValidCombos config…
amy-corson-ibigroup 7a75386
replace with acceptableValidModeCombos
amy-corson-ibigroup d5168e6
Address PR feedback
amy-corson-ibigroup 0669256
Merge branch 'dev' into strict-valid-mode-combos
amy-corson-ibigroup 0e94f51
fix indentation
amy-corson-ibigroup File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -982,6 +982,7 @@ export function routingQuery(searchId = null, updateSearchInReducer) { | |
| {} | ||
|
|
||
| const strictModes = !!config?.itinerary?.strictItineraryFiltering | ||
| const validModeCombinations = config?.itinerary?.validModeCombinations | ||
|
|
||
| // Filter mode definitions based on active mode keys | ||
| const activeModeButtons = config.modes?.modeButtons.filter((mb) => | ||
|
|
@@ -1114,6 +1115,22 @@ export function routingQuery(searchId = null, updateSearchInReducer) { | |
| activeModeStrings.includes(SIMPLIFICATIONS[leg.mode]) | ||
| ) | ||
| ) | ||
| // If "acceptableValidModeCombos" is provided, filter out itineraries that do not match our list of valid mode combinations | ||
| // (e.g. "WALK" + "DRIVE") | ||
| // TODO: Remove this once we switch to planConnection API | ||
| if (validModeCombinations?.length > 0) { | ||
| filteredItineraries = filteredItineraries.filter((itin) => { | ||
| const modeCombo = Array.from( | ||
| new Set(itin.legs.map((leg) => SIMPLIFICATIONS[leg.mode])) | ||
| ) | ||
| return validModeCombinations.find( | ||
| (vc) => | ||
| modeCombo.length === vc.length && | ||
| vc.every((m) => modeCombo.includes(m)) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i wasn't sure but indeed this is the most efficient way to do this! |
||
| ) | ||
| }) | ||
| } | ||
|
|
||
| // ... Otherwise return all itineraries. | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
indentation