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

fix coordinate extraction with less than 1 meters past lane distance

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-10-25 16:38:45 +02:00 committed by Daniel J. Hofmann
parent 7753845f5c
commit e8b947bca6
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
features/guidance/turn-angles.feature
View File

@ -1149,3 +1149,22 @@ Feature: Simple Turns
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
| a,m | gato,hain,hain | depart,turn left,arrive | | a,m | gato,hain,hain | depart,turn left,arrive |
Scenario: Segfaulting Regression
Given the node map
"""
a - - - - - - - - - - - - - - b c
|
|
|
d--------------e
"""
And the ways
| nodes | lanes:forward |
| ab | |
| bcde | 6 |
When I route I should get
| waypoints | route |
| a,e | ab,bcde,bcde |

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

@ -273,9 +273,10 @@ CoordinateExtractor::GetCoordinateAlongRoad(const NodeID intersection_node,
{ {
// skip over the first coordinates, in specific the assumed lane count. We add a small // skip over the first coordinates, in specific the assumed lane count. We add a small
// safety factor, to not overshoot on the regression // safety factor, to not overshoot on the regression
const auto trimmed_coordinates = TrimCoordinatesByLengthFront( const auto trimming_length = 0.8 * (considered_lanes * ASSUMED_LANE_WIDTH);
coordinates, 0.8 * (considered_lanes * ASSUMED_LANE_WIDTH)); const auto trimmed_coordinates =
if (trimmed_coordinates.size() >= 2) TrimCoordinatesByLengthFront(coordinates, 0.8 * trimming_length);
if (trimmed_coordinates.size() >= 2 && (total_distance >= trimming_length + 2))
{ {
// get the regression line // get the regression line
const auto regression_line_trimmed = RegressionLine(trimmed_coordinates); const auto regression_line_trimmed = RegressionLine(trimmed_coordinates);
@ -803,6 +804,10 @@ CoordinateExtractor::RegressionLine(const std::vector<util::Coordinate> &coordin
// (less dependent on modelling of the data in OSM) // (less dependent on modelling of the data in OSM)
const auto sampled_coordinates = SampleCoordinates(coordinates, FAR_LOOKAHEAD_DISTANCE, 1); const auto sampled_coordinates = SampleCoordinates(coordinates, FAR_LOOKAHEAD_DISTANCE, 1);
BOOST_ASSERT(!coordinates.empty());
if (sampled_coordinates.size() < 2) // less than 1 meter in length
return {coordinates.front(), coordinates.back()};
// compute the regression vector based on the sum of least squares // compute the regression vector based on the sum of least squares
const auto regression_line = leastSquareRegression(sampled_coordinates); const auto regression_line = leastSquareRegression(sampled_coordinates);
const auto coord_between_front = const auto coord_between_front =