pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] Fix category name from type resolver.

Browse source
This commit is contained in:
vng 2013-04-12 12:48:30 +02:00 • committed by Alex Zolotarev
parent afa8a7acc1
commit bc752c729c
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
indexer/classificator.cpp
View file

@ -286,6 +286,11 @@ namespace ftype
set_value(type, cl, 1);
}
}
uint8_t GetLevel(uint32_t type)
{
return get_control_level(type);
}
}
namespace

1
indexer/classificator.hpp
View file

@ -20,6 +20,7 @@ namespace ftype
bool GetValue(uint32_t type, uint8_t level, uint8_t & value);
void PopValue(uint32_t & type);
void TruncValue(uint32_t & type, uint8_t level);
uint8_t GetLevel(uint32_t type);
}
class ClassifObjectPtr

11
map/address_finder.cpp
View file

@ -340,17 +340,8 @@ namespace
size_t const count = types.Size();
for (size_t i = 0; i < count; ++i)
{
uint32_t type = types[i];
string s;
if (!eng->GetNameByType(type, lang, s))
{
// Try to use common type truncation if no match found.
ftype::TruncValue(type, 2);
(void)eng->GetNameByType(type, lang, s);
}
if (!s.empty())
if (eng->GetNameByType(types[i], lang, s))
info.m_types.push_back(s);
}

10
search/search_engine.cpp
View file

@ -8,6 +8,7 @@
#include "../indexer/search_string_utils.hpp"
#include "../indexer/mercator.hpp"
#include "../indexer/scales.hpp"
#include "../indexer/classificator.hpp"
#include "../platform/platform.hpp"
@ -380,7 +381,14 @@ string Engine::GetCountryName(string const & id)
bool Engine::GetNameByType(uint32_t type, int8_t lang, string & name) const
{
return m_pData->m_categories.GetNameByType(type, lang, name);
uint8_t level = ftype::GetLevel(type);
while (level >= 2)
{
if (m_pData->m_categories.GetNameByType(type, lang, name))
return true;
ftype::TruncValue(type, --level);
}
return false;
}
m2::RectD Engine::GetCountryBounds(string const & file) const