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

[search] Pass search query into Core as-is without any normalization.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-08-10 10:34:29 +03:00
parent 58ee1281bc
commit 7f335f15b1
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
iphone/Maps/Core/Search/MWMSearch.mm
View file

@ -139,7 +139,7 @@ using Observers = NSHashTable<Observer>;
std::string locale = (!inputLocale || inputLocale.length == 0)
? [MWMSearch manager]->m_locale
: inputLocale.UTF8String;
std::string text = query.precomposedStringWithCompatibilityMapping.UTF8String;
std::string text = query.UTF8String;
GetFramework().GetSearchAPI().SaveSearchQuery({std::move(locale), std::move(text)});
}
@ -151,7 +151,9 @@ using Observers = NSHashTable<Observer>;
if (inputLocale.length != 0)
manager->m_locale = inputLocale.UTF8String;
manager->m_query = query.precomposedStringWithCompatibilityMapping.UTF8String;
// Pass input query as-is without any normalization (precomposedStringWithCompatibilityMapping).
// Otherwise № -> No, and it's unexpectable for the search index.
manager->m_query = query.UTF8String;
manager->m_isCategory = (isCategory == YES);
manager.textChanged = YES;

6
qt/search_panel.cpp
View file

@ -195,9 +195,11 @@ bool SearchPanel::TryTrafficSimplifiedColorsCmd(QString const & str)
return true;
}
void SearchPanel::OnSearchTextChanged(QString const & str)
void SearchPanel::OnSearchTextChanged(QString const & normalized)
{
QString const normalized = str.normalized(QString::NormalizationForm_KC);
// Pass input query as-is without any normalization.
// Otherwise № -> No, and it's unexpectable for the search index.
//QString const normalized = str.normalized(QString::NormalizationForm_KC);
if (Try3dModeCmd(normalized))
return;