Add source phantom weight to first segment when merging legs #4949
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
…weights and durations are correct.
oxidase
reviewed
Mar 10, 2018
| // source phantom. We need to add those values back so that the total | ||
| // edge weight is correct | ||
| last_segment[old_size].weight_until_turn += | ||
| leggy_result.segment_end_coordinates[i].source_phantom.forward_weight; |
There was a problem hiding this comment.
if the source phantom is traversed in reverse then the reverse weight must be used:
leggy_result.source_traversed_in_reverse[i] ?
leggy_result.segment_end_coordinates[i].source_phantom.reverse_weight :
leggy_result.segment_end_coordinates[i].source_phantom.forward_weight;
oxidase
previously requested changes
Mar 10, 2018
features/testbot/matching.feature
Outdated
| Given a grid size of 10 meters | ||
| Given the node map | ||
| """ | ||
| a--1-b2cd-3--e |
There was a problem hiding this comment.
i suggest to make forward and reverse phantom node weights for bc segment different as a--1-b2-cd-3--e
features/testbot/matching.feature
Outdated
| | generate_hints | false | | ||
| When I match I should get | ||
| | trace | geometry | a:duration | a:weight | duration | | ||
| | 123 | 1.000135,1,1.000225,1,1.000315,1,1.00036,1,1.00045,1 | 1:1:0.5:1 | 1:1:0.5:1 | 3.5 | |
There was a problem hiding this comment.
... and here add a test for a reversed trace as 321
danpat
commented
Mar 13, 2018
| @@ -113,15 +114,39 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade, | |||
| const std::vector<DatasourceID> forward_datasources = | |||
| facade.GetUncompressedForwardDatasources(target_geometry_id); | |||
|
|
|||
| // FIXME if source and target phantoms are on the same segment then duration and weight | |||
|
I think this is ready to go as soon as Travis passes (there may be some (incorrect) tests affected by the fixed annotation calculation logic). |
danpat
added a commit
that referenced
this pull request
Mar 13, 2018
Fix annotation values for annotations on edges where phantom nodes are snapped.
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
This is a fix for #4948, where, when we merge legs together because of
waypoints=1,N, the first segment of each leg needs to have the source phantomforward_weight/durationvalue added (it is normally subtracted from the first segment, because it's only part of the road). The lack of this was leading to durations that were too short, andweight,speed, anddurationannotations containing incorrect values.Tasklist
/cc @bsudekum