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

Correct process and call of drawCircle.

Browse source
This commit is contained in:
vng 2011-02-05 19:45:17 +02:00 • committed by Alex Zolotarev
parent 299db51906
commit 54cd2ee602
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
indexer/classificator.cpp
View file

@ -286,7 +286,7 @@ namespace
void add_rule(int ft, iter_t i)
{
static const int visible[3][drule::count_of_rules] = {
{0, 0, 1, 1, 0, 0, 0}, // fpoint
{0, 0, 1, 1, 1, 0, 0}, // fpoint
{1, 0, 0, 0, 0, 1, 0}, // fline
{1, 1, 1, 1, 0, 0, 0} // farea
};
@ -406,7 +406,7 @@ bool ClassifObject::IsDrawableLike(feature_t ft) const
ASSERT ( ft <= farea, () );
static const int visible[3][drule::count_of_rules] = {
{0, 0, 1, 1, 0, 0, 0}, // fpoint
{0, 0, 1, 1, 1, 0, 0}, // fpoint
{1, 0, 0, 0, 0, 1, 0}, // fline
{0, 1, 0, 0, 0, 0, 0} // farea (!!! key difference with GetSuitable !!!)
};

21
map/drawer_yg.cpp
View file

@ -330,7 +330,7 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, rule_ptr_t * rules, int * depthV
if (isArea)
{
bool const isFill = pRule->GetFillColor() != -1;
bool isSym = isSymbol && ((pRule->GetType() & drule::way) != 0);
bool const isSym = isSymbol && ((pRule->GetType() & drule::way) != 0);
for (list<di::AreaInfo>::const_iterator i = pInfo->m_areas.begin(); i != pInfo->m_areas.end(); ++i)
{
@ -338,14 +338,17 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, rule_ptr_t * rules, int * depthV
drawArea(i->m_path, pRule, depth);
else if (isSym)
drawSymbol(i->GetCenter(), pRule, yg::EPosLeft, depth);
if (isCircle)
drawCircle(i->GetCenter(), pRule, depth);
}
}
// draw point symbol
if (!isPath && !isArea && isSymbol && ((pRule->GetType() & drule::node) != 0))
drawSymbol(pInfo->m_point, pRule, yg::EPosLeft, depth);
if (!isPath && !isArea && ((pRule->GetType() & drule::node) != 0))
{
if (isSymbol)
drawSymbol(pInfo->m_point, pRule, yg::EPosLeft, depth);
if (isCircle)
drawCircle(pInfo->m_point, pRule, depth);
}
}
else
{
@ -357,11 +360,7 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, rule_ptr_t * rules, int * depthV
if (isArea && isN)
{
for (list<di::AreaInfo>::const_iterator i = pInfo->m_areas.begin(); i != pInfo->m_areas.end(); ++i)
{
drawText(i->GetCenter(), pInfo->m_name, pRule, depth);
if (isCircle)
drawCircle(i->GetCenter(), pRule, depth);
}
}
// draw way name
@ -394,10 +393,6 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, rule_ptr_t * rules, int * depthV
isN = ((pRule->GetType() & drule::node) != 0);
if (!isPath && !isArea && isN)
drawText(pInfo->m_point, pInfo->m_name, pRule, depth);
if (isCircle)
drawCircle(pInfo->m_point, pRule, depth);
}
}
}