[android] Fix PT router overriding previous mode if subway layer active #7964
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
biodranik
added
Android
biodranik
reviewed
Apr 20, 2024
android/app/src/main/java/app/organicmaps/routing/RoutingController.java
Outdated
Show resolved
Hide resolved
|
Is that WebDebug failed test something I broke? Seemed like some network error 🤔 |
|
You can relaunch failed check manually. |
The public transportation router was forcibly overriding the previously selected mode whenever the planning activity was resumed, with the subway layer active. For instance, if you started a route planning (which automatically uses PT when that layer is on), switched to car mode and then changed some driving options, when you got back to the planning screen, the router would have changed back to PT, instead of keeping it on car. This occurred because of `RoutingController#rebuildLastRoute`, called whenever an activity (such as the driving options) concluded, which would, indirectly, call `RoutingController#initLastRouteType`. This method is responsible for defaulting the router to the most adequate type for the start+finish point combo, or, if the subway layer is selected, to set it to public transportaton. So, the fix was rather simple -- instead of only checking if the the subway layer is active (and if we're not comming from a link, but that isn't relevant here), we also check if we were already planning something, or if we're starting a new route plan. We only want to reset the mode to PT on the latter case. Fixes: organicmaps#7701 Signed-off-by: tmpod <tom@tmpod.dev>
Tmpod
force-pushed
the
fix/pt-routing-overwrite
branch
from
965aca0
to
713568d
Compare
biodranik
approved these changes
Apr 21, 2024
Jean-BaptisteC
approved these changes
Apr 21, 2024
|
Yep, tested this on Waydroid and on my phone!
|
|
What is blocking this PR from merging? |
|
Not sure, the PR is approved and tested. I think the maintainers just
haven't gotten around to it, most likely.
|
|
@Tmpod Thanks, and welcome to the club! |
|
Thank you! I'm already looking for the next issue to tackle :P
|
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.
The public transportation router was forcibly overriding the previously selected mode whenever the planning activity was resumed, with the subway layer active. For instance, if you started a route planning (which automatically uses PT when that layer is on), switched to car mode and then changed some driving options, when you got back to the planning screen, the router would have changed back to PT, instead of keeping it on car.
This occurred because of
RoutingController#rebuildLastRoute, called whenever an activity (such as the driving options) concluded, which would, indirectly, callRoutingController#initLastRouteType. This method is responsible for defaulting the router to the most adequate type for the start+finish point combo, or, if the subway layer is selected, to set it to public transportaton.So, the fix was rather simple -- instead of only checking if the the subway layer is active (and if we're not comming from a link, but that isn't relevant here), we also check if we were already planning something, or if we're starting a new route plan. We only want to reset the mode to PT on the latter case.
Fixes: #7701