forked from organicmaps/organicmaps
[search] change string to char const * for affics
This commit is contained in:
parent
87a6919eba
commit
a39175e9b7
1 changed files with 3 additions and 11 deletions
|
@ -98,7 +98,7 @@ public:
|
|||
/// @todo Move prefixes, suffixes into separate file (autogenerated).
|
||||
/// "Набережная" улица встречается в городах
|
||||
|
||||
string affics[] =
|
||||
char const * affics[] =
|
||||
{
|
||||
// Russian
|
||||
"аллея", "бульвар", "набережная", "переулок", "площадь", "проезд", "проспект", "шоссе", "тупик", "улица", "тракт", "ал", "бул", "наб", "пер", "пл", "пр", "просп", "ш", "туп", "ул", "тр",
|
||||
|
@ -175,17 +175,9 @@ void GetStreetName(strings::SimpleTokenizer iter, string & streetName)
|
|||
string const s = strings::MakeLowerCase(*iter);
|
||||
++iter;
|
||||
|
||||
bool flag = true;
|
||||
for (size_t i = 0; i < ARRAY_SIZE(affics); ++i)
|
||||
{
|
||||
if (s == affics[i])
|
||||
{
|
||||
flag = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
char const ** end = affics + ARRAY_SIZE(affics);
|
||||
|
||||
if (flag)
|
||||
if (find(affics, end, s) == end)
|
||||
streetName += s;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue