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

Merge pull request #1060 from gardster/turnaround_direction_fix

Browse source 
Turnaround direction fix.
This commit is contained in:
Vladimir Byko-Ianko 2015-12-21 12:58:01 +03:00
commit fe7c1e6859
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
routing/routing_integration_tests/osrm_turn_test.cpp
View file

@ -8,6 +8,30 @@
using namespace routing;
using namespace routing::turns;
UNIT_TEST(RussiaMoscowNagatinoUturnTurnTest)
{
TRouteResult const routeResult = integration::CalculateRoute(
integration::GetOsrmComponents(),
MercatorBounds::FromLatLon(55.67251, 37.63604), {-0.004, -0.01},
MercatorBounds::FromLatLon(55.67293, 37.63507));
Route const & route = *routeResult.first;
IRouter::ResultCode const result = routeResult.second;
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 3);
integration::GetNthTurn(route, 0)
.TestValid()
.TestDirection(TurnDirection::TurnRight);
integration::GetNthTurn(route, 1)
.TestValid()
.TestDirection(TurnDirection::UTurnLeft);
integration::GetNthTurn(route, 2).TestValid().TestDirection(TurnDirection::TurnLeft);
integration::TestRouteLength(route, 561.);
}
UNIT_TEST(RussiaMoscowLenigradskiy39UturnTurnTest)
{
TRouteResult const routeResult = integration::CalculateRoute(

4
routing/turns_generator.cpp
View file

@ -956,6 +956,10 @@ size_t CheckUTurnOnRoute(vector<LoadedPathSegment> const & segments, size_t curr
if (checkedSegment.m_name.empty())
return 0;
// Avoid returning to the same edge after uturn somewere else.
if (path[path.size() - 2] == checkedSegment.m_path[1])
return 0;
m2::PointD const v1 = path[path.size() - 1] - path[path.size() - 2];
m2::PointD const v2 = checkedSegment.m_path[1] - checkedSegment.m_path[0];