Fix handling of implicit access and egress mode parameters. #5821
Conversation
This file contains 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
If the 'modes' section is present but the nested 'access' or 'egress' parameters are not, then only transit that originates from/arrives directly at the stop should be used for the trip, just as if the parameter was present and set to null. Fix this by setting the corresponding mode to NOT_SET in the cases where 'modes' is specified but the parameter is not. Adapt and add tests to cover these cases better.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #5821 +/- ##
=============================================
+ Coverage 67.88% 67.91% +0.02%
- Complexity 16559 16560 +1
=============================================
Files 1908 1910 +2
Lines 72355 72437 +82
Branches 7443 7444 +1
=============================================
+ Hits 49120 49197 +77
- Misses 20714 20721 +7
+ Partials 2521 2519 -2 ☔ View full report in Codecov by Sentry. |
|
The behavior of #5779 is kept. I've removed the added comment though, as the default values are depending on whether the I would like to believe that the intention of #5675 is kept intact as well. If nothing else @eibakke has added nice tests on the functionality which helped a lot. 🌟 |
vpaturet
previously approved these changes
Apr 30, 2024
habrahamsson-skanetrafiken
requested changes
May 2, 2024
src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java
Show resolved
Hide resolved
src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java
Outdated
Show resolved
Hide resolved
…ogic. * Set NOT_SET early where applicable. * Rework how transferMode is applied but take care to not overwrite the defaults even if it's the same value.
habrahamsson-skanetrafiken
previously approved these changes
May 6, 2024
src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java
Outdated
Show resolved
Hide resolved
…estModesMapper.java Replace Optional-chain with a less complicated ternary condition. Co-authored-by: Henrik Abrahamsson <[email protected]>
habrahamsson-skanetrafiken
approved these changes
May 7, 2024
vpaturet
approved these changes
May 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
If the
modessection is present but the nestedaccessoregressparameters are not, then only transit that originates from/arrives directly at the stop should be used for the trip, just as if the parameter was present and set to null.Fix this by setting the corresponding mode to NOT_SET in the cases where
modesis specified but the parameter is not.This is a regression as compared to OTP 2.4.
Unit tests
Adapt and add tests to cover these cases better.
Manually verified most of the permutations of cases.