Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #2200 from oxidase/fix/uninitialised_alternative_segment

Browse Source 
Fixes using uninitialised values in extractRouteNames
This commit is contained in:
Patrick Niklaus 2016-04-03 22:58:04 +02:00
commit aa90d7b4b7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/engine/route_name_extraction.hpp
View File

@ -124,10 +124,6 @@ RouteNames extractRouteNames(std::vector<SegmentT> &shortest_path_segments,
{ {
std::swap(shortest_segment_1, shortest_segment_2); std::swap(shortest_segment_1, shortest_segment_2);
} }
if (alternative_segment_1.position > alternative_segment_2.position)
{
std::swap(alternative_segment_1, alternative_segment_2);
}
// fetching names for the selected segments // fetching names for the selected segments
route_names.shortest_path_name_1 = facade->get_name_for_id(shortest_segment_1.name_id); route_names.shortest_path_name_1 = facade->get_name_for_id(shortest_segment_1.name_id);
@ -135,6 +131,11 @@ RouteNames extractRouteNames(std::vector<SegmentT> &shortest_path_segments,
if (!alternative_path_segments.empty()) if (!alternative_path_segments.empty())
{ {
if (alternative_segment_1.position > alternative_segment_2.position)
{
std::swap(alternative_segment_1, alternative_segment_2);
}
route_names.alternative_path_name_1 = route_names.alternative_path_name_1 =
facade->get_name_for_id(alternative_segment_1.name_id); facade->get_name_for_id(alternative_segment_1.name_id);
route_names.alternative_path_name_2 = route_names.alternative_path_name_2 =