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

Don't sum up durations of merged steps since we do that in a different place now

Browse Source
This commit is contained in:
Patrick Niklaus 2016-03-18 16:54:25 +01:00
parent 2d4fc9a0b7
commit 64ace032f6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/engine/routing_algorithms/routing_base.hpp
View File

@ -324,6 +324,7 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
extractor::guidance::TurnInstruction::NO_TURN(), travel_mode, extractor::guidance::TurnInstruction::NO_TURN(), travel_mode,
INVALID_EXIT_NR}); INVALID_EXIT_NR});
} }
BOOST_ASSERT(unpacked_path.size() > 0);
unpacked_path.back().turn_instruction = turn_instruction; unpacked_path.back().turn_instruction = turn_instruction;
unpacked_path.back().duration_until_turn += (ed.distance - total_weight); unpacked_path.back().duration_until_turn += (ed.distance - total_weight);

2
src/engine/guidance/post_processing.cpp
View File

@ -30,7 +30,6 @@ PathData forwardInto(PathData destination, const PathData &source)
{ {
// Merge a turn into a silent turn // Merge a turn into a silent turn
// Overwrites turn instruction and increases exit NR // Overwrites turn instruction and increases exit NR
destination.duration_until_turn += source.duration_until_turn;
destination.exit = source.exit; destination.exit = source.exit;
return destination; return destination;
} }
@ -40,7 +39,6 @@ PathData accumulateInto(PathData destination, const PathData &source)
// Merge a turn into a silent turn // Merge a turn into a silent turn
// Overwrites turn instruction and increases exit NR // Overwrites turn instruction and increases exit NR
BOOST_ASSERT(canMergeTrivially(destination, source)); BOOST_ASSERT(canMergeTrivially(destination, source));
destination.duration_until_turn += source.duration_until_turn;
destination.exit = source.exit + 1; destination.exit = source.exit + 1;
return destination; return destination;
} }