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 /search/feature_loader.cpp | |
parent | dd7186b48be4636c1e67d223817a47f3f3a026e9 (diff) |
[indexer] DataSource refactoring
Diffstat (limited to 'search/feature_loader.cpp')
-rw-r--r-- | search/feature_loader.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/search/feature_loader.cpp b/search/feature_loader.cpp index 9841aa4b26..902c118625 100644 --- a/search/feature_loader.cpp +++ b/search/feature_loader.cpp @@ -1,12 +1,14 @@ #include "search/feature_loader.hpp" +#include "editor/editable_feature_source.hpp" + #include "indexer/feature_decl.hpp" #include "base/stl_add.hpp" namespace search { -FeatureLoader::FeatureLoader(DataSourceBase const & dataSource) : m_dataSource(dataSource) {} +FeatureLoader::FeatureLoader(DataSource const & dataSource) : m_dataSource(dataSource) {} bool FeatureLoader::Load(FeatureID const & id, FeatureType & ft) { @@ -14,7 +16,8 @@ bool FeatureLoader::Load(FeatureID const & id, FeatureType & ft) auto const & mwmId = id.m_mwmId; if (!m_guard || m_guard->GetId() != mwmId) - m_guard = my::make_unique<EditableDataSource::FeaturesLoaderGuard>(m_dataSource, mwmId); + m_guard = my::make_unique<DataSource::FeaturesLoaderGuard>(m_dataSource, mwmId, + EditableFeatureSourceFactory()); return m_guard->GetFeatureByIndex(id.m_index, ft); } |