Fix routes incorrectly ending on a road with a modal filter #189
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
dabreegster
commented
Mar 6, 2025
| @@ -158,6 +158,9 @@ impl Intersection { | |||
| if to_road.id == from_road.id { | |||
| return None; | |||
| } | |||
| if router_input.has_modal_filter(to_road.id) { | |||
| return None; | |||
There was a problem hiding this comment.
I think we will relax this later to solve part of #181. When a route starts or ends on a filtered road, we can travel only one direction along it, depending on the start position.
michaelkirk
approved these changes
Mar 6, 2025
| let Route { steps } = map.router_before.route_from_roads(r(3), r(2)).unwrap(); | ||
| assert_eq!( | ||
| steps, | ||
| vec![(r(3), Direction::Backwards), (r(2), Direction::Backwards)] | ||
| ); | ||
|
|
||
| // Filter r2 | ||
| map.add_modal_filter( |
There was a problem hiding this comment.
Thank you for adding a test! I think routing could be a bit of a whack-a-mole problem, so it's good to make sure we're not regressing.
There was a problem hiding this comment.
Easy to add tests once there's at least one :) Let the virtuous cycle continue!
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.
Cici spotted quite a notable bug:
An interior road right on the edge with a filter on it should not have any shortcuts! View shortcut mode reveals the problem is routes ending there:
Previously, I think we got away with this because of
ltn/backend/src/route.rs
Line 63 in 00fb50b
(road, direction)pairs and handling all roads connected to the start/end intersection somehow let this slip in.