diff options
Diffstat (limited to 'search/ranker.cpp')
| -rw-r--r-- | search/ranker.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/search/ranker.cpp b/search/ranker.cpp index 4239d4f95d..4ccc990df3 100644 --- a/search/ranker.cpp +++ b/search/ranker.cpp @@ -9,8 +9,9 @@ #include "search/token_slice.hpp" #include "search/utils.hpp" -#include "editor/editable_data_source.hpp" +#include "editor/editable_feature_source.hpp" +#include "indexer/data_source.hpp" #include "indexer/feature_algo.hpp" #include "indexer/search_string_utils.hpp" @@ -210,18 +211,18 @@ private: class RankerResultMaker { - using LoaderGuard = EditableDataSource::FeaturesLoaderGuard; Ranker & m_ranker; - DataSourceBase const & m_dataSource; + DataSource const & m_dataSource; Geocoder::Params const & m_params; storage::CountryInfoGetter const & m_infoGetter; - unique_ptr<LoaderGuard> m_loader; + unique_ptr<DataSource::FeaturesLoaderGuard> m_loader; bool LoadFeature(FeatureID const & id, FeatureType & ft) { if (!m_loader || m_loader->GetId() != id.m_mwmId) - m_loader = make_unique<LoaderGuard>(m_dataSource, id.m_mwmId); + m_loader = make_unique<DataSource::FeaturesLoaderGuard>(m_dataSource, id.m_mwmId, + EditableFeatureSourceFactory()); if (!m_loader->GetFeatureByIndex(id.m_index, ft)) return false; @@ -332,7 +333,7 @@ class RankerResultMaker } public: - RankerResultMaker(Ranker & ranker, DataSourceBase const & dataSource, + RankerResultMaker(Ranker & ranker, DataSource const & dataSource, storage::CountryInfoGetter const & infoGetter, Geocoder::Params const & params) : m_ranker(ranker), m_dataSource(dataSource), m_params(params), m_infoGetter(infoGetter) { @@ -359,7 +360,7 @@ public: } }; -Ranker::Ranker(DataSourceBase const & dataSource, CitiesBoundariesTable const & boundariesTable, +Ranker::Ranker(DataSource const & dataSource, CitiesBoundariesTable const & boundariesTable, storage::CountryInfoGetter const & infoGetter, KeywordLangMatcher & keywordsScorer, Emitter & emitter, CategoriesHolder const & categories, vector<Suggest> const & suggests, VillagesCache & villagesCache, |