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/discovery/discovery_manager.cpp | |
parent | dd7186b48be4636c1e67d223817a47f3f3a026e9 (diff) |
[indexer] DataSource refactoring
Diffstat (limited to 'map/discovery/discovery_manager.cpp')
-rw-r--r-- | map/discovery/discovery_manager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/map/discovery/discovery_manager.cpp b/map/discovery/discovery_manager.cpp index 13693bb942..b8bdc895b4 100644 --- a/map/discovery/discovery_manager.cpp +++ b/map/discovery/discovery_manager.cpp @@ -1,6 +1,8 @@ #include "map/discovery/discovery_manager.hpp" -#include "editor/editable_data_source.hpp" +#include "editor/editable_feature_source.hpp" + +#include "indexer/data_source.hpp" #include <sstream> @@ -23,7 +25,7 @@ std::string GetQuery(discovery::ItemType const type) namespace discovery { -Manager::Manager(DataSourceBase const & dataSource, search::CityFinder & cityFinder, APIs const & apis) +Manager::Manager(DataSource const & dataSource, search::CityFinder & cityFinder, APIs const & apis) : m_dataSource(dataSource) , m_cityFinder(cityFinder) , m_searchApi(apis.m_search) @@ -69,7 +71,8 @@ std::string Manager::GetCityViatorId(m2::PointD const & point) const if (!fid.IsValid()) return {}; - EditableDataSource::FeaturesLoaderGuard const guard(m_dataSource, fid.m_mwmId); + DataSource::FeaturesLoaderGuard const guard(m_dataSource, fid.m_mwmId, + EditableFeatureSourceFactory()); FeatureType ft; if (!guard.GetFeatureByIndex(fid.m_index, ft)) { |