diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-02-02 17:31:11 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:21:32 +0300 |
| commit | dbe555605f496e65df0e762bec3dc3da75e009d5 (patch) | |
| tree | 2f5902d58d8411a421ba73e216ec93b59522be1a /pedestrian_routing_tests | |
| parent | de3a5b9df15bfc5b3c957197921cc369753d0998 (diff) | |
[new downloader] Moving new developed map downloader functionality to new map downloader branch.
Diffstat (limited to 'pedestrian_routing_tests')
| -rw-r--r-- | pedestrian_routing_tests/pedestrian_routing_tests.cpp | 4 | ||||
| -rw-r--r-- | pedestrian_routing_tests/pedestrian_routing_tests.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pedestrian_routing_tests/pedestrian_routing_tests.cpp b/pedestrian_routing_tests/pedestrian_routing_tests.cpp index 161b6d37a6..4875392cb8 100644 --- a/pedestrian_routing_tests/pedestrian_routing_tests.cpp +++ b/pedestrian_routing_tests/pedestrian_routing_tests.cpp @@ -91,7 +91,7 @@ unique_ptr<storage::CountryInfoGetter> CreateCountryInfoGetter() unique_ptr<routing::IRouter> CreatePedestrianAStarTestRouter(Index & index, storage::CountryInfoGetter & cig) { - auto UKGetter = [&](m2::PointD const & pt) { return cig.GetRegionFile(pt); }; + auto UKGetter = [&](m2::PointD const & pt) { return cig.GetRegionCountryId(pt); }; unique_ptr<routing::IVehicleModelFactory> vehicleModelFactory(new SimplifiedPedestrianModelFactory()); unique_ptr<routing::IRoutingAlgorithm> algorithm(new routing::AStarRoutingAlgorithm()); unique_ptr<routing::IRouter> router(new routing::RoadGraphRouter("test-astar-pedestrian", index, UKGetter, move(vehicleModelFactory), move(algorithm), nullptr)); @@ -100,7 +100,7 @@ unique_ptr<routing::IRouter> CreatePedestrianAStarTestRouter(Index & index, stor unique_ptr<routing::IRouter> CreatePedestrianAStarBidirectionalTestRouter(Index & index, storage::CountryInfoGetter & cig) { - auto UKGetter = [&](m2::PointD const & pt) { return cig.GetRegionFile(pt); }; + auto UKGetter = [&](m2::PointD const & pt) { return cig.GetRegionCountryId(pt); }; unique_ptr<routing::IVehicleModelFactory> vehicleModelFactory(new SimplifiedPedestrianModelFactory()); unique_ptr<routing::IRoutingAlgorithm> algorithm(new routing::AStarBidirectionalRoutingAlgorithm()); unique_ptr<routing::IRouter> router(new routing::RoadGraphRouter("test-astar-bidirectional-pedestrian", index, UKGetter, move(vehicleModelFactory), move(algorithm), nullptr)); diff --git a/pedestrian_routing_tests/pedestrian_routing_tests.pro b/pedestrian_routing_tests/pedestrian_routing_tests.pro index 8885083f95..59d343a6be 100644 --- a/pedestrian_routing_tests/pedestrian_routing_tests.pro +++ b/pedestrian_routing_tests/pedestrian_routing_tests.pro @@ -5,7 +5,7 @@ TEMPLATE = app ROOT_DIR = ../ DEPENDENCIES = map routing search storage indexer platform editor geometry coding base \ - osrm jansson protobuf tomcrypt succinct pugixml + osrm jansson protobuf tomcrypt stats_client succinct pugixml macx-*: LIBS *= "-framework IOKit" |