gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #846 from bykoianko/master-uturn-fix

Browse source 
Oneway uturn bugfix
This commit is contained in:
Lev Dragunov 2015-12-04 10:42:08 +03:00
commit c4d1e6ae15
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
routing/routing_integration_tests/osrm_turn_test.cpp
View file

@ -396,3 +396,16 @@ UNIT_TEST(SwitzerlandSamstagernBergstrasseTest)
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 0);
}
UNIT_TEST(RussiaMoscowMikoiankNoUTurnTest)
{
TRouteResult const routeResult = integration::CalculateRoute(
integration::GetOsrmComponents(), MercatorBounds::FromLatLon(55.79041, 37.53770), {0., 0.},
MercatorBounds::FromLatLon(55.79182, 37.53008));
Route const & route = *routeResult.first;
IRouter::ResultCode const result = routeResult.second;
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 0);
}

10
routing/turns_generator.cpp
View file

@ -918,16 +918,13 @@ size_t CheckUTurnOnRoute(vector<LoadedPathSegment> const & segments, size_t curr
checkedSegment.m_isLink == masterSegment.m_isLink && !checkedSegment.m_onRoundabout)
{
auto const & path = masterSegment.m_path;
m2::PointD p1 = path[path.size() - 1] - path[path.size() - 2];
m2::PointD p2 = checkedSegment.m_path[1] - checkedSegment.m_path[0];
// Same segment UTurn case.
if (i == 0)
{
// TODO Fix direction calculation.
// Warning! We can not determine UTurn direction in single edge case. So we use UTurnLeft.
// We decided to add driving rules (left-right sided driving) to mwm header.
if (p1 == p2)
if (path[path.size() - 2] == checkedSegment.m_path[1])
{
turn.m_turn = TurnDirection::UTurnLeft;
return 1;
@ -940,7 +937,10 @@ size_t CheckUTurnOnRoute(vector<LoadedPathSegment> const & segments, size_t curr
if (checkedSegment.m_name.empty())
return 0;
auto angle = ang::TwoVectorsAngle(m2::PointD::Zero(), p1, p2);
m2::PointD const v1 = path[path.size() - 1] - path[path.size() - 2];
m2::PointD const v2 = checkedSegment.m_path[1] - checkedSegment.m_path[0];
auto angle = ang::TwoVectorsAngle(m2::PointD::Zero(), v1, v2);
if (!my::AlmostEqualAbs(angle, math::pi, kUTurnHeadingSensitivity))
return 0;