diff options
author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-05-13 17:48:57 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:47:31 +0300 |
commit | a71d8e2c0fbf13f09a194de73bf73c8becf46610 (patch) | |
tree | e052fa83b0d39208a4645671a3ae3a102a733bd0 /routing/road_graph_router.hpp | |
parent | 67cc39cb058f4ad7a6ebd45cc186c0eb111cb9bb (diff) |
PR fixes
Diffstat (limited to 'routing/road_graph_router.hpp')
-rw-r--r-- | routing/road_graph_router.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/routing/road_graph_router.hpp b/routing/road_graph_router.hpp index 2a035cae7e..bd6b76241b 100644 --- a/routing/road_graph_router.hpp +++ b/routing/road_graph_router.hpp @@ -9,6 +9,7 @@ #include "geometry/point2d.hpp" #include "std/function.hpp" +#include "std/string.hpp" #include "std/unique_ptr.hpp" #include "std/vector.hpp" @@ -16,13 +17,13 @@ class Index; namespace routing { -typedef function<string(m2::PointD const &)> CountryFileFnT; - class RoadGraphRouter : public IRouter { public: + typedef function<string(m2::PointD const &)> TMwmFileByPointFn; + RoadGraphRouter(Index const * pIndex, unique_ptr<IVehicleModel> && vehicleModel, - CountryFileFnT const & fn); + TMwmFileByPointFn const & fn); ~RoadGraphRouter(); ResultCode CalculateRoute(m2::PointD const & startPoint, m2::PointD const & startDirection, @@ -41,7 +42,6 @@ protected: unique_ptr<IRoadGraph> m_roadGraph; unique_ptr<IVehicleModel> const m_vehicleModel; Index const * m_pIndex; // non-owning ptr - CountryFileFnT m_countryFileFn; + TMwmFileByPointFn m_countryFileFn; }; - } // namespace routing |