Adding point altitude to Junction. Using Junction instead of m2::PointD in RoadInfo.

1 files changed, 27 insertions, 19 deletions

diff --git a/routing/routing_tests/road_graph_nearest_edges_test.cpp b/routing/routing_tests/road_graph_nearest_edges_test.cpp
index e1f3424acf..757c7623ea 100644
--- a/routing/routing_tests/road_graph_nearest_edges_test.cpp
+++ b/routing/routing_tests/road_graph_nearest_edges_test.cpp
@@ -30,20 +30,20 @@ UNIT_TEST(RoadGraph_NearestEdges)
   RoadGraphMockSource graph;
   {
     IRoadGraph::RoadInfo ri0;
-    ri0.m_points.emplace_back(-2, 0);
-    ri0.m_points.emplace_back(-1, 0);
-    ri0.m_points.emplace_back(0, 0);
-    ri0.m_points.emplace_back(1, 0);
-    ri0.m_points.emplace_back(2, 0);
+    ri0.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(-2, 0)));
+    ri0.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(-1, 0)));
+    ri0.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(0, 0)));
+    ri0.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(1, 0)));
+    ri0.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(2, 0)));
     ri0.m_speedKMPH = 5;
     ri0.m_bidirectional = true;
 
     IRoadGraph::RoadInfo ri1;
-    ri1.m_points.emplace_back(0, -2);
-    ri1.m_points.emplace_back(0, -1);
-    ri1.m_points.emplace_back(0, 0);
-    ri1.m_points.emplace_back(0, 1);
-    ri1.m_points.emplace_back(0, 2);
+    ri1.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(0, -2)));
+    ri1.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(0, -1)));
+    ri1.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(0, 0)));
+    ri1.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(0, 1)));
+    ri1.m_junctions.push_back(MakeJunctionForTesting(m2::PointD(0, 2)));
     ri1.m_speedKMPH = 5;
     ri1.m_bidirectional = true;
 
@@ -52,25 +52,33 @@ UNIT_TEST(RoadGraph_NearestEdges)
   }
 
   // We are standing at x junction.
-  Junction const crossPos(m2::PointD(0, 0));
+  Junction const crossPos = MakeJunctionForTesting(m2::PointD(0, 0));
 
   // Expected outgoing edges.
   IRoadGraph::TEdgeVector expectedOutgoing =
   {
-    Edge(MakeTestFeatureID(0) /* first road */, false /* forward */, 1 /* segId */, m2::PointD(0, 0), m2::PointD(-1, 0)),
-    Edge(MakeTestFeatureID(0) /* first road */, true /* forward */, 2 /* segId */, m2::PointD(0, 0), m2::PointD(1, 0)),
-    Edge(MakeTestFeatureID(1) /* second road */, false /* forward */, 1 /* segId */, m2::PointD(0, 0), m2::PointD(0, -1)),
-    Edge(MakeTestFeatureID(1) /* second road */, true /* forward */, 2 /* segId */, m2::PointD(0, 0), m2::PointD(0, 1)),
+    Edge(MakeTestFeatureID(0) /* first road */, false /* forward */, 1 /* segId */,
+      MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(-1, 0))),
+    Edge(MakeTestFeatureID(0) /* first road */, true /* forward */, 2 /* segId */,
+      MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(1, 0))),
+    Edge(MakeTestFeatureID(1) /* second road */, false /* forward */, 1 /* segId */,
+      MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(0, -1))),
+    Edge(MakeTestFeatureID(1) /* second road */, true /* forward */, 2 /* segId */,
+      MakeJunctionForTesting(m2::PointD(0, 0)), MakeJunctionForTesting(m2::PointD(0, 1))),
   };
   sort(expectedOutgoing.begin(), expectedOutgoing.end());
 
   // Expected ingoing edges.
   IRoadGraph::TEdgeVector expectedIngoing =
   {
-    Edge(MakeTestFeatureID(0) /* first road */, true /* forward */, 1 /* segId */, m2::PointD(-1, 0), m2::PointD(0, 0)),
-    Edge(MakeTestFeatureID(0) /* first road */, false /* forward */, 2 /* segId */, m2::PointD(1, 0), m2::PointD(0, 0)),
-    Edge(MakeTestFeatureID(1) /* second road */, true /* forward */, 1 /* segId */, m2::PointD(0, -1), m2::PointD(0, 0)),
-    Edge(MakeTestFeatureID(1) /* second road */, false /* forward */, 2 /* segId */, m2::PointD(0, 1), m2::PointD(0, 0)),
+    Edge(MakeTestFeatureID(0) /* first road */, true /* forward */, 1 /* segId */,
+      MakeJunctionForTesting(m2::PointD(-1, 0)), MakeJunctionForTesting(m2::PointD(0, 0))),
+    Edge(MakeTestFeatureID(0) /* first road */, false /* forward */, 2 /* segId */,
+      MakeJunctionForTesting(m2::PointD(1, 0)), MakeJunctionForTesting(m2::PointD(0, 0))),
+    Edge(MakeTestFeatureID(1) /* second road */, true /* forward */, 1 /* segId */,
+      MakeJunctionForTesting(m2::PointD(0, -1)), MakeJunctionForTesting(m2::PointD(0, 0))),
+    Edge(MakeTestFeatureID(1) /* second road */, false /* forward */, 2 /* segId */,
+      MakeJunctionForTesting(m2::PointD(0, 1)), MakeJunctionForTesting(m2::PointD(0, 0))),
   };
   sort(expectedIngoing.begin(), expectedIngoing.end());