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

Cross routing NodeByPoint method test.

Browse source
This commit is contained in:
Lev Dragunov 2015-10-27 18:14:56 +03:00
parent af001ed07b
commit d8de1921c3
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routing/cross_mwm_road_graph.cpp
View file

@ -178,7 +178,7 @@ void CrossMwmGraph::GetOutgoingEdgesList(BorderCross const & v,
CHECK(found, ());
if (ingoingNode.m_nodeId != v.toNode.node)
{
LOG(LDEBUG, ("Several nodes stores in one border point.", v.toNode.point));
LOG(LDEBUG, ("Several nodes stores in a one border point.", v.toNode.point));
vector<IngoingCrossNode> ingoingNodes;
currentContext.GetAllIngoingNodes(ingoingNodes);
for(auto const & node : ingoingNodes)

27
routing/routing_tests/cross_routing_tests.cpp
View file

@ -104,4 +104,31 @@ UNIT_TEST(TestAdjacencyMatrix)
routing::kInvalidContextEdgeWeight, ("Default cost"));
}
UNIT_TEST(TestFindingByPoint)
{
routing::CrossRoutingContextWriter context;
routing::CrossRoutingContextReader newContext;
ms::LatLon p1(1., 1.), p2(5., 5.), p3(10.,1.);
context.AddIngoingNode(1, ms::LatLon::Zero());
context.AddIngoingNode(2, p1);
context.AddIngoingNode(3, p2);
context.AddOutgoingNode(4, "foo", ms::LatLon::Zero());
context.ReserveAdjacencyMatrix();
vector<char> buffer;
MemWriter<vector<char> > writer(buffer);
context.Save(writer);
TEST_GREATER(buffer.size(), 5, ("Context serializer make some data"));
MemReader reader(buffer.data(), buffer.size());
newContext.Load(reader);
IngoingCrossNode node;
TEST(newContext.FindIngoingNodeByPoint(p1, node), ());
TEST_EQUAL(node.m_nodeId, 2, ());
TEST(newContext.FindIngoingNodeByPoint(p2, node), ());
TEST_EQUAL(node.m_nodeId, 3, ());
TEST(!newContext.FindIngoingNodeByPoint(p3, node), ());
}
} // namespace