Roundabouts into ferries #3766
Merged
Roundabouts into ferries #3766
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
TheMarex
force-pushed
the
roundabout_into_ferry
branch
from
f954d46 to
705986f
Compare
daniel-j-h
approved these changes
Apr 7, 2017
| inline bool RouteStep::IsCompatible(const RouteStep &other) const | ||
| { | ||
| return mode == other.mode; | ||
| } |
There was a problem hiding this comment.
Hm I'm a bit out of the loop here but I thought we had this exact function already.
Can't see it on the route step, so this should be fine for sure.
There was a problem hiding this comment.
We have a similar concept for graph compression, I didn't find anything explicit for guidance.
There was a problem hiding this comment.
| @@ -144,6 +146,14 @@ inline RouteStep &RouteStep::AddInFront(const RouteStep &preceeding_step) | |||
| return *this; | |||
| } | |||
|
|
|||
| // checks whether we can actually merge two route steps: | |||
| // They neeed to have the same mode, because a route step | |||
| // can only have one mode. | |||
There was a problem hiding this comment.
Maybe add the comments to the decl. and not the impl.
include/storage/shared_monitor.hpp
Outdated
| @@ -12,7 +12,7 @@ | |||
| #include <boost/interprocess/sync/scoped_lock.hpp> | |||
|
|
|||
| #if defined(__linux__) | |||
| #define USE_BOOST_INTERPROCESS_CONDITION 1 | |||
| //#define USE_BOOST_INTERPROCESS_CONDITION 1 | |||
There was a problem hiding this comment.
Do you want to revert this before merging?
| BOOST_ASSERT(leavesRoundabout(steps[step_index].maneuver.instruction)); | ||
| steps[step_index-1].maneuver.instruction = steps[step_index].maneuver.instruction; | ||
| if (!entersRoundabout(steps[step_index-1].maneuver.instruction)) | ||
| steps[step_index-1].maneuver.exit = steps[step_index].maneuver.exit; |
There was a problem hiding this comment.
can you alias steps[step_index - 1] for readability
| steps[step_index-1].maneuver.instruction = steps[step_index].maneuver.instruction; | ||
| if (!entersRoundabout(steps[step_index-1].maneuver.instruction)) | ||
| steps[step_index-1].maneuver.exit = steps[step_index].maneuver.exit; | ||
| steps[step_index].maneuver.instruction.type = TurnType::Notification; |
There was a problem hiding this comment.
Notification to signal a change in travel mode?
TheMarex
force-pushed
the
roundabout_into_ferry
branch
from
d6d762e to
976f874
Compare
4 tasks
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.
Issue
Resolves #3762
Tasklist
- see discussion over at ticket