feat: separate waypoint logic #457
Draft
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
Collaborator
Archdoog
commented
Feb 11, 2025
Archdoog
commented
- Separates waypoint advance logic out of step advance fn. This reduces the conditional burden required to advance a waypoint. It also enables flexible waypoint advance logic.
Comment on lines
+338
to
+348
| if let Some(waypoint) = remaining_waypoints.first() { | ||
| let current_location: Point = snapped_user_location.coordinates.into(); | ||
| let next_waypoint: Point = waypoint.coordinate.into(); | ||
| match self.config.waypoint_advance { | ||
| WaypointAdvanceMode::WaypointWithinRange(range) => { | ||
| Haversine::distance(current_location, next_waypoint) < range | ||
| } | ||
| } | ||
| } else { | ||
| false | ||
| } |
There was a problem hiding this comment.
Nice work! I think you can make this even more compact with the is_some_and like this:
remaining_waypoints.first().is_some_and(|waypoint| {
// Rest of the inner code
}Then you can drop the whole if/else wrapper and it's a single expression inside :)
Co-authored-by: Ian Wagner <[email protected]>
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.