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

Added unicode Compatible Composition for all features "name" to improve search

Browse source
This commit is contained in:
Alex Zolotarev 2011-05-26 23:14:38 +02:00 • committed by Alex Zolotarev
parent 10be7ac8eb
commit 015250ae97
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/generator_tool/generator_tool.pro
View file

@ -9,7 +9,7 @@ CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
# needed for Platform::WorkingDir()
# needed for Platform::WorkingDir() and unicode combining
QT += core
win32:LIBS += -lShell32

11
generator/osm2type.cpp
View file

@ -18,7 +18,7 @@
#include "../std/set.hpp"
#include "../std/algorithm.hpp"
#include "../base/start_mem_debug.hpp"
#include <QtCore/QString>
namespace ftype {
@ -548,7 +548,14 @@ namespace ftype {
string lang;
strings::Tokenize(k, "\t :", get_lang(lang));
if (!lang.empty())
m_params.name.AddString(lang, v);
{
// Unicode Compatibility Decomposition,
// followed by Canonical Composition (NFKC).
// Needed for better search matching
QByteArray const normBytes = QString::fromUtf8(
v.c_str()).normalized(QString::NormalizationForm_KC).toUtf8();
m_params.name.AddString(lang, normBytes.constData());
}
// get layer
if (k == "layer" && m_params.layer == 0)