Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLev Dragunov <l.dragunov@corp.mail.ru>2015-07-27 17:13:07 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:58:36 +0300
commite1668eeda0dcfd9286cb2dd70eac455b69a89665 (patch)
tree763af15e179f7a735ebe6e878f3933d6ab4633a9 /integration_tests
parent09cb4e5245e836fbf89169adf4f13c130a09a0ab (diff)
Routing observer interface implementation.
Diffstat (limited to 'integration_tests')
-rw-r--r--integration_tests/routing_test_tools.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/integration_tests/routing_test_tools.cpp b/integration_tests/routing_test_tools.cpp
index 80435c1427..6ab57990bf 100644
--- a/integration_tests/routing_test_tools.cpp
+++ b/integration_tests/routing_test_tools.cpp
@@ -11,6 +11,7 @@
#include "routing/online_cross_fetcher.hpp"
#include "routing/road_graph_router.hpp"
#include "routing/route.hpp"
+#include "routing/timeout_observer.hpp"
#include "search/search_engine.hpp"
@@ -98,7 +99,7 @@ namespace integration
shared_ptr<IRouter> CreatePedestrianRouter(Index & index)
{
- unique_ptr<IRouter> router = CreatePedestrianAStarBidirectionalRouter(index, nullptr);
+ unique_ptr<IRouter> router = CreatePedestrianAStarBidirectionalRouter(index);
return shared_ptr<IRouter>(move(router));
}
@@ -193,11 +194,12 @@ namespace integration
m2::PointD const & startPoint, m2::PointD const & startDirection,
m2::PointD const & finalPoint)
{
+ TimeoutObserver observer;
IRouter * router = routerComponents.GetRouter();
ASSERT(router, ());
shared_ptr<Route> route(new Route("mapsme"));
IRouter::ResultCode result =
- router->CalculateRoute(startPoint, startDirection, finalPoint, nullptr, *route.get());
+ router->CalculateRoute(startPoint, startDirection, finalPoint, observer, *route.get());
ASSERT(route, ());
return TRouteResult(route, result);
}