diff options
author | Maxim Pimenov <m@maps.me> | 2017-01-13 17:09:42 +0300 |
---|---|---|
committer | Maxim Pimenov <m@maps.me> | 2017-01-13 17:09:42 +0300 |
commit | 7dfc46eaa95395a14764aec8382b031f3ce45e53 (patch) | |
tree | 46a2950cc9f9037f158d015ab1f0c40c71cac57f /indexer/search_string_utils.cpp | |
parent | 1549c45b1c20acd6285d041b12f4b284f915298d (diff) |
[search] Returned normalization to string synonyms.
Diffstat (limited to 'indexer/search_string_utils.cpp')
-rw-r--r-- | indexer/search_string_utils.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/indexer/search_string_utils.cpp b/indexer/search_string_utils.cpp index 9f78a6e115..216b5b59b8 100644 --- a/indexer/search_string_utils.cpp +++ b/indexer/search_string_utils.cpp @@ -9,7 +9,6 @@ using namespace strings; namespace search { - UniString NormalizeAndSimplifyString(string const & s) { UniString uniString = MakeUniString(s); @@ -111,9 +110,6 @@ public: // English "street", "avenue", "square", "road", "boulevard", "drive", "highway", "lane", "way", "circle", "st", "av", "ave", "sq", "rd", "blvd", "dr", "hwy", "ln", - // German - "strasse", "weg", "platz", - // Lithuanian "g", "pr", "pl", "kel", @@ -127,7 +123,7 @@ public: "ulice", "ul", "náměstí", "nám", // Deutsch - German - "allee", "al", "brücke", "br", "chaussee", "gasse", "gr", "pfad", "straße", "str", + "allee", "al", "brücke", "br", "chaussee", "gasse", "gr", "pfad", "straße", "str", "weg", "platz", // Español - Spanish "avenida", "avd", "avda", "bulevar", "bulev", "calle", "calleja", "cllja", "callejón", "callej", "cjon", "cllon", "callejuela", "cjla", "callizo", "cllzo", "calzada", "czada", "costera", "coste", "plza", "pza", "plazoleta", "pzta", "plazuela", "plzla", "tránsito", "trans", "transversal", "trval", "trasera", "tras", "travesía", "trva", @@ -166,12 +162,12 @@ public: "quốc lộ", "ql", "tỉnh lộ", "tl", "Đại lộ", "Đl", "Đường", "Đ", "Đường sắt", "Đs", "Đường phố", "Đp", "vuông", "con Đường", "Đại lộ", "Đường cao tốc", // Українська - Ukrainian - "дорога", "провулок", "площа", "шосе", "вулиция", "дор", "пров", "вул" + "дорога", "провулок", "площа", "шосе", "вулиця", "дор", "пров", "вул" }; for (auto const * s : affics) { - UniString const us = MakeUniString(s); + UniString const us = NormalizeAndSimplifyString(s); m_strings.Add(us.begin(), us.end()); } } @@ -193,8 +189,7 @@ private: }; StreetsSynonymsHolder g_streets; - -} // namespace +} // namespace UniString GetStreetNameAsKey(string const & name) { @@ -248,4 +243,4 @@ void StreetTokensFilter::Put(strings::UniString const & token, bool isPrefix, si } EmitToken(token, tag); } -} // namespace search +} // namespace search |