diff options
Diffstat (limited to 'map/discovery')
-rw-r--r-- | map/discovery/discovery_manager.cpp | 9 | ||||
-rw-r--r-- | map/discovery/discovery_manager.hpp | 6 |
2 files changed, 9 insertions, 6 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)) { diff --git a/map/discovery/discovery_manager.hpp b/map/discovery/discovery_manager.hpp index c6010fda04..bb489ec202 100644 --- a/map/discovery/discovery_manager.hpp +++ b/map/discovery/discovery_manager.hpp @@ -23,7 +23,7 @@ #include <utility> #include <vector> -class DataSourceBase; +class DataSource; namespace discovery { @@ -54,7 +54,7 @@ public: using ErrorCalback = std::function<void(uint32_t const requestId, ItemType const type)>; - Manager(DataSourceBase const & dataSource, search::CityFinder & cityFinder, APIs const & apis); + Manager(DataSource const & dataSource, search::CityFinder & cityFinder, APIs const & apis); template <typename ResultCallback> uint32_t Discover(Params && params, ResultCallback const & onResult, ErrorCalback const & onError) @@ -153,7 +153,7 @@ private: static search::DiscoverySearchParams GetSearchParams(Manager::Params const & params, ItemType const type); std::string GetCityViatorId(m2::PointD const & point) const; - DataSourceBase const & m_dataSource; + DataSource const & m_dataSource; search::CityFinder & m_cityFinder; SearchAPI & m_searchApi; viator::Api const & m_viatorApi; |