AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] Use exact preferred categories for categorial request.

Browse source
This commit is contained in:
tatiana-yan 2018-08-20 18:52:07 +03:00 • committed by mpimenov
parent cf75e55bc6
commit d681afd883
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
search/processor.cpp
View file

@ -275,8 +275,12 @@ void Processor::SetQuery(string const & query)
// Get preferred types to show in results.
m_preferredTypes.clear();
ForEachCategoryType(QuerySliceOnRawStrings<decltype(m_tokens)>(m_tokens, m_prefix),
[&](size_t, uint32_t t) { m_preferredTypes.push_back(t); });
auto const tokenSlice = QuerySliceOnRawStrings<decltype(m_tokens)>(m_tokens, m_prefix);
m_isCategorialRequest = FillCategories(tokenSlice, GetCategoryLocales(), m_categories, m_preferredTypes);
if (!m_isCategorialRequest)
ForEachCategoryType(tokenSlice, [&](size_t, uint32_t t) { m_preferredTypes.push_back(t); });
my::SortUnique(m_preferredTypes);
}
@ -501,13 +505,10 @@ void Processor::InitParams(QueryParams & params) const
params.GetTypeIndices(i).push_back(index);
};
auto const tokenSlice = QuerySliceOnRawStrings<decltype(m_tokens)>(m_tokens, m_prefix);
vector<uint32_t> types;
bool const isCategorialRequest =
FillCategories(tokenSlice, GetCategoryLocales(), m_categories, types);
params.SetCategorialRequest(isCategorialRequest);
if (isCategorialRequest)
params.SetCategorialRequest(m_isCategorialRequest);
if (m_isCategorialRequest)
{
for (auto const type : types)
for (auto const type : m_preferredTypes)
{
uint32_t const index = c.GetIndexForType(type);
for (size_t i = 0; i < tokenSlice.Size(); ++i)

1
search/processor.hpp
View file

@ -122,6 +122,7 @@ protected:
std::string m_query;
QueryTokens m_tokens;
strings::UniString m_prefix;
bool m_isCategorialRequest;
std::vector<uint32_t> m_preferredTypes;
m2::RectD m_viewport;