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

Routing crosses finding fix.

Browse source
This commit is contained in:
Lev Dragunov 2016-04-06 14:16:37 +03:00
parent 8a0c4803d2
commit eb757f3d95
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
routing/cross_mwm_road_graph.cpp
View file

@ -6,6 +6,7 @@
namespace
{
inline bool IsValidEdgeWeight(EdgeWeight const & w) { return w != INVALID_EDGE_WEIGHT; }
double constexpr kMwmCrossingNodeEqualityRadiusDegrees = 0.001;
}
namespace routing
@ -58,7 +59,7 @@ IRouter::ResultCode CrossMwmGraph::SetStartNode(CrossNode const & startNode)
for (auto const & nextCross : nextCrosses)
{
if (nextCross.toNode.IsValid())
dummyEdges.emplace_back(nextCross, weights[i]);
dummyEdges.emplace_back(nextCross, weights[i]);
}
}
}
@ -158,7 +159,7 @@ bool CrossMwmGraph::ConstructBorderCrossImpl(OutgoingCrossNode const & startNode
nextMapping->LoadCrossContext();
nextMapping->m_crossContext.ForEachIngoingNodeNearPoint(startNode.m_point, [&](IngoingCrossNode const & node)
{
if (node.m_point == startNode.m_point)
if (node.m_point.EqualDxDy(startNode.m_point, kMwmCrossingNodeEqualityRadiusDegrees))
{
auto const toCross = CrossNode(node.m_nodeId, nextMapping->GetMwmId(), node.m_point);
if (toCross.IsValid())

7
routing/routing_integration_tests/osrm_route_test.cpp
View file

@ -121,6 +121,13 @@ namespace
{37.40993977728661, 67.644784047393685}, 14296.);
}
UNIT_TEST(NederlandLeeuwardenToDenOeverTest)
{
integration::CalculateRouteAndTestRouteLength(integration::GetOsrmComponents(),
MercatorBounds::FromLatLon(53.2076, 5.7082), {0., 0.},
MercatorBounds::FromLatLon(52.9337, 5.0308), 59500.);
}
UNIT_TEST(RussiaMoscowGerPanfilovtsev22SolodchaPravdiRouteTest)
{
integration::CalculateRouteAndTestRouteLength(