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

Correct fix to display either translated category name for type (or it’s base type), or untranslated name.

Browse source
This commit is contained in:
Alex Zolotarev 2016-03-07 20:38:56 +02:00 • committed by Sergey Yershov
parent 32742a73c6
commit ea3fee3d72
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
indexer/categories_holder.cpp
View file

@ -202,10 +202,23 @@ bool CategoriesHolder::GetNameByType(uint32_t type, int8_t locale, string & name
string CategoriesHolder::GetReadableFeatureType(uint32_t type, int8_t locale) const
{
ASSERT_NOT_EQUAL(type, 0, ());
uint8_t level = ftype::GetLevel(type);
ASSERT_GREATER(level, 0, ());
uint32_t originalType = type;
string name;
if (GetNameByType(type, locale, name))
return name;
return classif().GetReadableObjectName(type);
while (true)
{
if (GetNameByType(type, locale, name))
return name;
if (--level == 0)
break;
ftype::TruncValue(type, level);
}
return classif().GetReadableObjectName(originalType);
}
bool CategoriesHolder::IsTypeExist(uint32_t type) const