diff options
Diffstat (limited to 'routing/routing_tests')
-rw-r--r-- | routing/routing_tests/index_graph_test.cpp | 2 | ||||
-rw-r--r-- | routing/routing_tests/index_graph_tools.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/routing/routing_tests/index_graph_test.cpp b/routing/routing_tests/index_graph_test.cpp index 584cd35035..2e28334904 100644 --- a/routing/routing_tests/index_graph_test.cpp +++ b/routing/routing_tests/index_graph_test.cpp @@ -131,7 +131,7 @@ UNIT_TEST(EdgesTest) RoadGeometry::Points({{3.0, -1.0}, {3.0, 0.0}, {3.0, 1.0}})); traffic::TrafficCache const trafficCache; - IndexGraph graph(move(loader), CreateEstimatorForCar(trafficCache)); + IndexGraph graph(make_shared<Geometry>(move(loader)), CreateEstimatorForCar(trafficCache)); vector<Joint> joints; joints.emplace_back(MakeJoint({{0, 1}, {3, 1}})); // J0 diff --git a/routing/routing_tests/index_graph_tools.cpp b/routing/routing_tests/index_graph_tools.cpp index f88dc70c54..975dddeac5 100644 --- a/routing/routing_tests/index_graph_tools.cpp +++ b/routing/routing_tests/index_graph_tools.cpp @@ -2,6 +2,8 @@ #include "testing/testing.hpp" +#include "routing/geometry.hpp" + #include "routing/base/routing_result.hpp" #include "routing_common/car_model.hpp" @@ -311,7 +313,7 @@ unique_ptr<SingleVehicleWorldGraph> BuildWorldGraph(unique_ptr<TestGeometryLoade shared_ptr<EdgeEstimator> estimator, vector<Joint> const & joints) { - auto graph = make_unique<IndexGraph>(move(geometryLoader), estimator); + auto graph = make_unique<IndexGraph>(make_shared<Geometry>(move(geometryLoader)), estimator); graph->Import(joints); auto indexLoader = make_unique<TestIndexGraphLoader>(); indexLoader->AddGraph(kTestNumMwmId, move(graph)); @@ -323,7 +325,7 @@ unique_ptr<SingleVehicleWorldGraph> BuildWorldGraph(unique_ptr<ZeroGeometryLoade shared_ptr<EdgeEstimator> estimator, vector<Joint> const & joints) { - auto graph = make_unique<IndexGraph>(move(geometryLoader), estimator); + auto graph = make_unique<IndexGraph>(make_shared<Geometry>(move(geometryLoader)), estimator); graph->Import(joints); auto indexLoader = make_unique<TestIndexGraphLoader>(); indexLoader->AddGraph(kTestNumMwmId, move(graph)); @@ -336,7 +338,7 @@ unique_ptr<TransitWorldGraph> BuildWorldGraph(unique_ptr<TestGeometryLoader> geo vector<Joint> const & joints, transit::GraphData const & transitData) { - auto indexGraph = make_unique<IndexGraph>(move(geometryLoader), estimator); + auto indexGraph = make_unique<IndexGraph>(make_shared<Geometry>(move(geometryLoader)), estimator); indexGraph->Import(joints); auto transitGraph = make_unique<TransitGraph>(kTestNumMwmId, estimator); |