kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[search] Correct Ranker::m_pivotRegion initialization.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2023-11-17 00:41:08 -03:00
parent f8dd250a90
commit d5c2ddabec
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
search/processor.cpp
View file

@ -3,7 +3,6 @@
#include "ge0/parser.hpp"
#include "search/common.hpp"
#include "search/cuisine_filter.hpp"
#include "search/geometry_utils.hpp"
#include "search/intermediate_result.hpp"
#include "search/latlon_match.hpp"
@ -11,7 +10,6 @@
#include "search/postcode_points.hpp"
#include "search/query_params.hpp"
#include "search/ranking_utils.hpp"
#include "search/search_index_values.hpp"
#include "search/search_params.hpp"
#include "search/utils.hpp"
#include "search/utm_mgrs_coords_match.hpp"
@ -25,17 +23,14 @@
#include "indexer/feature.hpp"
#include "indexer/feature_algo.hpp"
#include "indexer/feature_utils.hpp"
#include "indexer/features_vector.hpp"
#include "indexer/ftypes_matcher.hpp"
#include "indexer/mwm_set.hpp"
#include "indexer/postcodes_matcher.hpp"
#include "indexer/search_delimiters.hpp"
#include "indexer/search_string_utils.hpp"
#include "indexer/trie_reader.hpp"
#include "platform/preferred_languages.hpp"
#include "coding/compressed_bit_vector.hpp"
#include "coding/string_utf8_multilang.hpp"
#include "geometry/latlon.hpp"
@ -911,7 +906,11 @@ void Processor::InitRanker(Geocoder::Params const & geocoderParams,
params.m_batchSize = searchParams.m_batchSize;
params.m_limit = searchParams.m_maxNumResults;
params.m_pivot = GetPivotPoint(viewportSearch);
params.m_pivotRegion = GetPivotRegion();
{
storage::CountryInfo info;
m_infoGetter.GetRegionInfo(params.m_pivot, info);
params.m_pivotRegion = std::move(info.m_name);
}
params.m_preferredTypes = m_preferredTypes;
// Remove "secondary" category types from preferred.

3
search/processor.hpp
View file

@ -64,7 +64,6 @@ public:
void SetPreferredLocale(std::string const & locale);
void SetInputLocale(std::string const & locale);
void SetQuery(std::string const & query, bool categorialRequest = false);
inline std::string const & GetPivotRegion() const { return m_region; }
inline bool IsEmptyQuery() const { return m_prefix.empty() && m_tokens.empty(); }
@ -146,8 +145,6 @@ protected:
using CountriesTrie = base::MemTrie<storage::CountryId, base::VectorValues<bool>>;
CountriesTrie m_countriesTrie;
std::string m_region;
/// @todo Replace with QueryParams.
/// @{
std::string m_query;