map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed categories loading.

Browse source
This commit is contained in:
vng 2016-04-29 18:32:59 +03:00 • committed by Alex Zolotarev
parent 892829b301
commit 3f1b0c9d22
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
indexer/categories_holder.cpp
View file

@ -98,6 +98,7 @@ void CategoriesHolder::LoadFromStream(istream & s)
// Allow for comments starting with '#' character.
if (!line.empty() && line[0] == '#')
continue;
strings::SimpleTokenizer iter(line, state == EParseTypes ? "|" : ":|");
switch (state)
@ -142,6 +143,20 @@ void CategoriesHolder::LoadFromStream(istream & s)
{
if (!iter)
{
// If the category groups are specified, add translations from them.
///@todo According to the current logic, categories.txt should have
/// the blank string at the end of file.
if (!types.empty())
{
for (string const & group : currentGroups)
{
auto trans = groupTranslations.equal_range(group);
for (auto it = trans.first; it != trans.second; ++it)
cat.m_synonyms.push_back(it->second);
}
}
state = EParseTypes;
continue;
}
@ -199,17 +214,6 @@ void CategoriesHolder::LoadFromStream(istream & s)
else
cat.m_synonyms.push_back(name);
}
if (!types.empty())
{
// If a category group is specified, add translations from it.
for (string const & group : currentGroups)
{
auto trans = groupTranslations.equal_range(group);
for (auto it = trans.first; it != trans.second; ++it)
cat.m_synonyms.push_back(it->second);
}
}
}
break;
}

3
indexer/indexer_tests/categories_test.cpp
View file

@ -201,7 +201,8 @@ UNIT_TEST(CategoriesIndex_Groups)
"en:buns\n"
"\n"
"shop-butcher|@shop|@meat\n"
"en:butcher";
"en:butcher\n"
"";
classificator::Load();
CategoriesHolder holder(make_unique<MemReader>(kCategories, sizeof(kCategories) - 1));