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

Merge pull request #1052 from gardster/turnaround_fix

Browse source 
Roundabout exit number fix.
This commit is contained in:
Vladimir Byko-Ianko 2015-12-18 16:56:16 +03:00
commit b00c828519
2 changed files with 42 additions and 3 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

@ -84,6 +84,26 @@ UNIT_TEST(RussiaMoscowTrikotagniAndPohodniRoundaboutTurnTest)
integration::TestRouteLength(route, 387.);
}
UNIT_TEST(SwedenBarlangeRoundaboutTurnTest)
{
TRouteResult const routeResult = integration::CalculateRoute(
integration::GetOsrmComponents(), MercatorBounds::FromLatLon(60.48278, 15.42356), {0., 0.},
MercatorBounds::FromLatLon(60.48462, 15.42120));
Route const & route = *routeResult.first;
IRouter::ResultCode const result = routeResult.second;
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 2);
integration::GetNthTurn(route, 0)
.TestValid()
.TestDirection(TurnDirection::EnterRoundAbout)
.TestRoundAboutExitNum(2);
integration::GetNthTurn(route, 1).TestValid().TestDirection(TurnDirection::LeaveRoundAbout);
integration::TestRouteLength(route, 255.);
}
UNIT_TEST(RussiaMoscowPlanetnaiTurnTest)
{
TRouteResult const routeResult = integration::CalculateRoute(
@ -231,11 +251,11 @@ UNIT_TEST(RussiaHugeRoundaboutTurnTest)
integration::GetNthTurn(route, 0)
.TestValid()
.TestDirection(TurnDirection::EnterRoundAbout)
.TestRoundAboutExitNum(4);
.TestRoundAboutExitNum(5);
integration::GetNthTurn(route, 1)
.TestValid()
.TestDirection(TurnDirection::LeaveRoundAbout)
.TestRoundAboutExitNum(4);
.TestRoundAboutExitNum(5);
}
UNIT_TEST(BelarusMiskProspNezavisimostiMKADTurnTest)

21
routing/turns_generator.cpp
View file

@ -178,6 +178,24 @@ bool KeepTurnByHighwayClass(TurnDirection turn, TTurnCandidates const & possible
return true;
}
/*!
* \brief Returns false when other possible turns leads to service roads;
*/
bool KeepRoundaboutTurnByHighwayClass(TurnDirection turn, TTurnCandidates const & possibleTurns,
TurnInfo const & turnInfo, Index const & index,
RoutingMapping & mapping)
{
for (auto const & t : possibleTurns)
{
if (t.node == turnInfo.m_outgoing.m_nodeId)
continue;
ftypes::HighwayClass const highwayClass = GetOutgoingHighwayClass(t.node, mapping, index);
if (static_cast<int>(highwayClass) != static_cast<int>(ftypes::HighwayClass::Service))
return true;
}
return false;
}
bool DiscardTurnByIngoingAndOutgoingEdges(TurnDirection intermediateDirection,
TurnInfo const & turnInfo, TurnItem const & turn)
{
@ -861,15 +879,16 @@ void GetTurnDirection(Index const & index, RoutingMapping & mapping, TurnInfo &
turn.m_turn = intermediateDirection;
}
bool const keepTurnByHighwayClass = KeepTurnByHighwayClass(turn.m_turn, nodes, turnInfo, index, mapping);
if (turnInfo.m_ingoing.m_onRoundabout || turnInfo.m_outgoing.m_onRoundabout)
{
bool const keepTurnByHighwayClass = KeepRoundaboutTurnByHighwayClass(turn.m_turn, nodes, turnInfo, index, mapping);
turn.m_turn = GetRoundaboutDirection(turnInfo.m_ingoing.m_onRoundabout,
turnInfo.m_outgoing.m_onRoundabout, hasMultiTurns,
keepTurnByHighwayClass);
return;
}
bool const keepTurnByHighwayClass = KeepTurnByHighwayClass(turn.m_turn, nodes, turnInfo, index, mapping);
if (!turn.m_keepAnyway && !keepTurnByHighwayClass)
{
turn.m_turn = TurnDirection::NoTurn;