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

shift circle angle a bit

Browse Source
This commit is contained in:
Moritz Kobitzsch 2017-07-25 13:34:08 +02:00
parent 4757c96d9a
commit 153e934ed4
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/extractor/guidance/coordinate_extractor.cpp
View File

@ -122,15 +122,6 @@ util::Coordinate CoordinateExtractor::ExtractRepresentativeCoordinate(
// coordinate set to add a small level of fault tolerance // coordinate set to add a small level of fault tolerance
const constexpr double skipping_inaccuracies_distance = 2; const constexpr double skipping_inaccuracies_distance = 2;
// fallback, mostly necessary for dead ends
if (intersection_node == to_node)
{
const auto result = ExtractCoordinateAtLength(skipping_inaccuracies_distance, coordinates);
// TODO: possibly re-enable with https://github.com/Project-OSRM/osrm-backend/issues/3470
// BOOST_ASSERT(not_same_as_start(result));
return result;
}
const auto &turn_edge_data = node_based_graph.GetEdgeData(turn_edge); const auto &turn_edge_data = node_based_graph.GetEdgeData(turn_edge);
// roundabouts, check early to avoid other costly checks // roundabouts, check early to avoid other costly checks
@ -377,14 +368,14 @@ util::Coordinate CoordinateExtractor::ExtractRepresentativeCoordinate(
* destination lanes and the ones that performa a larger turn. * destination lanes and the ones that performa a larger turn.
*/ */
coordinates = TrimCoordinatesToLength( coordinates = TrimCoordinatesToLength(
std::move(coordinates), 2 * skipping_inaccuracies_distance, segment_distances); std::move(coordinates), 3 * skipping_inaccuracies_distance, segment_distances);
BOOST_ASSERT(coordinates.size() >= 2); BOOST_ASSERT(coordinates.size() >= 2);
segment_distances.resize(coordinates.size()); segment_distances.resize(coordinates.size());
segment_distances.back() = util::coordinate_calculation::haversineDistance( segment_distances.back() = util::coordinate_calculation::haversineDistance(
*(coordinates.end() - 2), coordinates.back()); *(coordinates.end() - 2), coordinates.back());
const auto vector_head = coordinates.back(); const auto vector_head = coordinates.back();
coordinates = TrimCoordinatesToLength( coordinates = TrimCoordinatesToLength(
std::move(coordinates), skipping_inaccuracies_distance, segment_distances); std::move(coordinates), 2 * skipping_inaccuracies_distance, segment_distances);
BOOST_ASSERT(coordinates.size() >= 2); BOOST_ASSERT(coordinates.size() >= 2);
const auto result = const auto result =
GetCorrectedCoordinate(turn_coordinate, coordinates.back(), vector_head); GetCorrectedCoordinate(turn_coordinate, coordinates.back(), vector_head);