[generator] addr:street should be exactly equal to street name

This commit is contained in:
Ilya Zverev 2016-06-16 16:39:27 +03:00 committed by Vladimir Byko-Ianko
parent 730e48bbb0
commit 9a1a5df5c3

View file

@ -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);
}