diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-06-28 13:52:59 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-07-23 10:25:10 +0300 |
| commit | 7de86381e97a0606dd7db6dcba600178d9095202 (patch) | |
| tree | 02ee1e5fedd2a3ae4a8e773b7b43db575c717ac7 /pedestrian_routing_tests | |
| parent | bd69eb97cb4e577f95e10e4a594b2ab4266772a5 (diff) | |
Adding point altitude to Junction. Using Junction instead of m2::PointD in RoadInfo.
Diffstat (limited to 'pedestrian_routing_tests')
| -rw-r--r-- | pedestrian_routing_tests/pedestrian_routing_tests.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pedestrian_routing_tests/pedestrian_routing_tests.cpp b/pedestrian_routing_tests/pedestrian_routing_tests.cpp index c21b792ac0..8abaaad192 100644 --- a/pedestrian_routing_tests/pedestrian_routing_tests.cpp +++ b/pedestrian_routing_tests/pedestrian_routing_tests.cpp @@ -4,10 +4,12 @@ #include "indexer/classificator_loader.hpp" #include "routing/features_road_graph.hpp" -#include "routing/road_graph_router.hpp" -#include "routing/route.hpp" #include "routing/pedestrian_directions.hpp" #include "routing/pedestrian_model.hpp" +#include "routing/pedestrian_model.hpp" +#include "routing/road_graph.hpp" +#include "routing/road_graph_router.hpp" +#include "routing/route.hpp" #include "routing/router_delegate.hpp" #include "storage/country_info_getter.hpp" @@ -124,7 +126,8 @@ m2::PointD GetPointOnEdge(routing::Edge & e, double posAlong) return e.GetStartJunction().GetPoint() + d * posAlong; } -void GetNearestPedestrianEdges(Index & index, m2::PointD const & pt, vector<pair<routing::Edge, m2::PointD>> & edges) +void GetNearestPedestrianEdges(Index & index, m2::PointD const & pt, + vector<pair<routing::Edge, routing::Junction>> & edges) { unique_ptr<routing::IVehicleModelFactory> vehicleModelFactory(new SimplifiedPedestrianModelFactory()); routing::FeaturesRoadGraph roadGraph(index, routing::IRoadGraph::Mode::IgnoreOnewayTag, @@ -189,11 +192,11 @@ void TestTwoPointsOnFeature(m2::PointD const & startPos, m2::PointD const & fina TEST(id.IsAlive(), ()); } - vector<pair<routing::Edge, m2::PointD>> startEdges; + vector<pair<routing::Edge, routing::Junction>> startEdges; GetNearestPedestrianEdges(index, startPos, startEdges); TEST(!startEdges.empty(), ()); - vector<pair<routing::Edge, m2::PointD>> finalEdges; + vector<pair<routing::Edge, routing::Junction>> finalEdges; GetNearestPedestrianEdges(index, finalPos, finalEdges); TEST(!finalEdges.empty(), ()); |