Fix bug with MapRoute onClick #703
Merged
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
Guardiola31337
requested changes
Feb 15, 2018
There was a problem hiding this comment.
Although changes to fix the bug seem legit, I think now is a good opportunity to work on improving NavigationMapRoute class which is getting large and apply The Boy Scout Rule.
| @@ -601,50 +607,66 @@ public void removeRoute() { | |||
|
|
|||
| @Override | |||
| public void onMapClick(@NonNull LatLng point) { | |||
| if (directionsRoutes == null || directionsRoutes.isEmpty() || !alternativesVisible) { | |||
|
|
|||
| @@ -601,50 +607,66 @@ public void removeRoute() { | |||
|
|
|||
| @Override | |||
| public void onMapClick(@NonNull LatLng point) { | |||
There was a problem hiding this comment.
IMO onMapClick is getting too long.
What about extracting blocks of code into well-named (based on the comments) private methods and simplifying conditional expressions?
| List<com.mapbox.geojson.Point> linePoints = new ArrayList<>(); | ||
| for (Feature feature : featureCollection.getFeatures()) { | ||
| List<Position> positions = (List<Position>) feature.getGeometry().getCoordinates(); | ||
| private boolean calculateClickDistancesFromRoutes(HashMap<Double, DirectionsRoute> routeDistancesAwayFromClick, |
| @@ -703,7 +725,7 @@ public void onProgressChange(Location location, RouteProgress routeProgress) { | |||
| * the source into pieces so data-driven styling can be used to change the route colors | |||
| * accordingly. | |||
| */ | |||
| private static FeatureCollection addTrafficToSource(DirectionsRoute route, int index) { | |||
| private FeatureCollection addTrafficToSource(DirectionsRoute route, int index) { | |||
danesfeder
force-pushed
the
dan-map-route-fix
branch
from
19327e0
to
1b98f4a
Compare
|
@Guardiola31337 Added some refactoring to address your comments |
Guardiola31337
approved these changes
Feb 15, 2018
There was a problem hiding this comment.
Although NavigationMapRoute could be heavily refactored (there are some methods pretty long, a bunch magic numbers, among other things) this is definitely a good start 🚀
Good job @danesfeder 👏
This was referenced Feb 26, 2018
Closed
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.
Closes #701
Also fixed up some of the logic in regard to how we handle clicking on alternatives. Previously, if both routes were within the
250mpadding, the logic would sometimes still choose the index for the already clicked route even if we clicked on the alternative.Current
master:This PR:
cc @cammace