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

[search] Fixed search for Apple-specific emoji variations.

Browse source
This commit is contained in:
vng 2015-09-30 13:19:01 +03:00
parent bdd1b883c3
commit c7350fe933
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
search/search_query.cpp
View file

@ -368,16 +368,34 @@ void Query::ForEachCategoryTypes(ToDo toDo) const
{
for (int j = 0; j < localesCount; ++j)
m_pCategories->ForEachTypeByName(arrLocales[j], m_tokens[i], bind<void>(ref(toDo), i, _1));
ProcessEmojiIfNeeded(m_tokens[i], i, toDo);
}
if (!m_prefix.empty())
{
for (int j = 0; j < localesCount; ++j)
m_pCategories->ForEachTypeByName(arrLocales[j], m_prefix, bind<void>(ref(toDo), tokensCount, _1));
ProcessEmojiIfNeeded(m_prefix, tokensCount, toDo);
}
}
}
template <class ToDo>
void Query::ProcessEmojiIfNeeded(strings::UniString const & token, size_t ind, ToDo & toDo) const
{
// Special process of 2 codepoints emoji (e.g. black guy on a bike).
// Only emoji synonyms can have one codepoint.
if (token.size() > 1)
{
static int8_t const enLocaleCode = CategoriesHolder::MapLocaleToInteger("en");
m_pCategories->ForEachTypeByName(enLocaleCode, strings::UniString(1, token[0]),
bind<void>(ref(toDo), ind, _1));
}
}
void Query::SetQuery(string const & query)
{
m_query = &query;

2
search/search_query.hpp
View file

@ -129,6 +129,8 @@ private:
int GetCategoryLocales(int8_t (&arr) [3]) const;
template <class ToDo> void ForEachCategoryTypes(ToDo toDo) const;
template <class ToDo> void ProcessEmojiIfNeeded(
strings::UniString const & token, size_t ind, ToDo & toDo) const;
using TMWMVector = vector<shared_ptr<MwmInfo>>;
using TOffsetsVector = map<MwmSet::MwmId, vector<uint32_t>>;