Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Zverev <zverik@textual.ru>2016-06-16 16:39:27 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-06-24 13:31:44 +0300
commit9a1a5df5c340e8f343f48f5925c553f0ebd6259c (patch)
treec489357eb9265d0016af5955d8ef92de44f56ade /indexer/search_string_utils.cpp
parent730e48bbb09b2c98d75a5c0f93220096677e59a8 (diff)
[generator] addr:street should be exactly equal to street name
Diffstat (limited to 'indexer/search_string_utils.cpp')
-rw-r--r--indexer/search_string_utils.cpp7
1 files 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);
}