From 9a1a5df5c340e8f343f48f5925c553f0ebd6259c Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Thu, 16 Jun 2016 16:39:27 +0300 Subject: [PATCH] [generator] addr:street should be exactly equal to street name --- indexer/search_string_utils.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/indexer/search_string_utils.cpp b/indexer/search_string_utils.cpp index 280be0856a..9f78a6e115 100644 --- a/indexer/search_string_utils.cpp +++ b/indexer/search_string_utils.cpp @@ -198,6 +198,9 @@ StreetsSynonymsHolder g_streets; UniString GetStreetNameAsKey(string const & name) { + if (name.empty()) + return UniString(); + UniString res; SimpleTokenizer iter(name, kStreetTokensSeparator); while (iter) @@ -205,11 +208,9 @@ UniString GetStreetNameAsKey(string const & name) UniString const s = NormalizeAndSimplifyString(*iter); ++iter; - if (!g_streets.FullMatch(s)) - res.append(s); + res.append(s); } - // In case when street name has only synonym tokens, but we should return valid key. return (res.empty() ? NormalizeAndSimplifyString(name) : res); }