From efc9007cbfef1875d2970f5084a7c514aa55bd7b Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Thu, 7 Jan 2016 22:49:03 +0100 Subject: [PATCH] Remore start_phantom/target_phantom because they are useless here --- include/engine/guidance/segment_list.hpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/engine/guidance/segment_list.hpp b/include/engine/guidance/segment_list.hpp index 97c059c2c..d034df6ee 100644 --- a/include/engine/guidance/segment_list.hpp +++ b/include/engine/guidance/segment_list.hpp @@ -7,11 +7,13 @@ #include "engine/internal_route_result.hpp" #include "engine/phantom_node.hpp" #include "engine/segment_information.hpp" - +#include "util/integer_range.hpp" +#include "util/coordinate_calculation.hpp" #include "extractor/turn_instructions.hpp" #include +#include #include #include #include @@ -249,9 +251,6 @@ void SegmentList::Finalize(const bool extract_alternative, (extract_alternative ? raw_route.alternative_path_length : raw_route.shortest_path_length) / 10.)); - auto start_phantom = raw_route.segment_end_coordinates.front().source_phantom; - auto target_phantom = raw_route.segment_end_coordinates.back().target_phantom; - // Post-processing to remove empty or nearly empty path segments if (segments.size() > 2 && std::numeric_limits::epsilon() > segments.back().length && !(segments.end() - 2)->is_via_location) @@ -259,9 +258,6 @@ void SegmentList::Finalize(const bool extract_alternative, segments.pop_back(); segments.back().necessary = true; segments.back().turn_instruction = TurnInstruction::NoTurn; - target_phantom.name_id = - (segments.end() - 2) - ->name_id; // TODO check whether this -2 is desired after the pop-back } if (segments.size() > 2 && std::numeric_limits::epsilon() > segments.front().length && @@ -270,7 +266,6 @@ void SegmentList::Finalize(const bool extract_alternative, segments.erase(segments.begin()); segments.front().turn_instruction = TurnInstruction::HeadOn; segments.front().necessary = true; - start_phantom.name_id = segments.front().name_id; } if (allow_simplification)