diff options
author | tatiana-yan <tatiana.kondakova@gmail.com> | 2018-06-26 10:51:37 +0300 |
---|---|---|
committer | Arsentiy Milchakov <milcars@mapswithme.com> | 2018-06-27 19:20:52 +0300 |
commit | 570b2b0b35df1fad001460eccf35da31e334b8b0 (patch) | |
tree | 2f805cf3122db499b794248f3f6c1bdd232b258c /map/transit/transit_reader.hpp | |
parent | dd7186b48be4636c1e67d223817a47f3f3a026e9 (diff) |
[indexer] DataSource refactoring
Diffstat (limited to 'map/transit/transit_reader.hpp')
-rw-r--r-- | map/transit/transit_reader.hpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/map/transit/transit_reader.hpp b/map/transit/transit_reader.hpp index 2df70dda9d..4b6a8c81b1 100644 --- a/map/transit/transit_reader.hpp +++ b/map/transit/transit_reader.hpp @@ -23,7 +23,7 @@ #include <string> #include <vector> -class DataSourceBase; +class DataSource; using FeatureCallback = std::function<void (FeatureType const &)>; using TReadFeaturesFn = std::function<void (FeatureCallback const & , std::vector<FeatureID> const &)>; @@ -31,8 +31,7 @@ using TReadFeaturesFn = std::function<void (FeatureCallback const & , std::vecto class ReadTransitTask: public threads::IRoutine { public: - ReadTransitTask(DataSourceBase & dataSource, - TReadFeaturesFn const & readFeaturesFn) + ReadTransitTask(DataSource & dataSource, TReadFeaturesFn const & readFeaturesFn) : m_dataSource(dataSource), m_readFeaturesFn(readFeaturesFn) {} @@ -65,7 +64,7 @@ private: } }; - DataSourceBase & m_dataSource; + DataSource & m_dataSource; TReadFeaturesFn m_readFeaturesFn; uint64_t m_id = 0; @@ -90,7 +89,7 @@ public: using GetMwmsByRectFn = function<vector<MwmSet::MwmId>(m2::RectD const &)>; using TransitStateChangedFn = function<void(TransitSchemeState)>; - TransitReadManager(DataSourceBase & dataSource, TReadFeaturesFn const & readFeaturesFn, + TransitReadManager(DataSource & dataSource, TReadFeaturesFn const & readFeaturesFn, GetMwmsByRectFn const & getMwmsByRectFn); ~TransitReadManager(); @@ -122,7 +121,7 @@ private: uint64_t m_nextTasksGroupId = 0; std::map<uint64_t, size_t> m_tasksGroups; - DataSourceBase & m_dataSource; + DataSource & m_dataSource; TReadFeaturesFn m_readFeaturesFn; df::DrapeEngineSafePtr m_drapeEngine; |