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

stylesheet linecaps, gaps in zoomlevels, removal of heuristics

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-01-17 19:35:23 +03:00 • committed by Alex Zolotarev
parent 05ef929575
commit 49a2f23b2e
3 changed files with 403 additions and 343 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto.bin
View file

Binary file not shown.

705
data/drules_proto.txt
View file

File diff suppressed because it is too large Load diff

41
indexer/classificator.cpp
View file

@ -308,7 +308,7 @@ namespace
static const int visible[3][drule::count_of_rules] = {
{0, 0, 1, 1, 1, 0, 0}, // fpoint
{1, 0, 0, 0, 0, 1, 0}, // fline
{1, 1, 1, 1, 0, 0, 0} // farea
{1, 1, 1, 1, 0, 1, 0} // farea
};
if (visible[ft][i->m_type] == 1)
@ -329,20 +329,6 @@ namespace
} while (i != m_rules.end() && i->m_scale == m_scales[0]);
}
void look_backward(int ft)
{
if (m_scales[1] < 0) return;
iter_t i = m_iters[1];
do
{
add_rule(ft, i);
if (i == m_rules.begin())
break;
else
--i;
} while (i->m_scale == m_scales[1]);
}
public:
suitable_getter(vec_t const & rules, vec_t & keys)
: m_rules(rules), m_keys(keys)
@ -364,31 +350,6 @@ namespace
look_forward(ft);
return;
}
// find less or equal scale
m_iters[1] = upper_bound(m_rules.begin(), m_rules.end(), scale, less_scales());
if (m_iters[1] != m_rules.begin())
{
--m_iters[1];
m_scales[1] = m_iters[1]->m_scale;
}
else
m_scales[1] = -1000;
// choose the nearest scale to process first
m_added = false;
if (abs(m_scales[0] - scale) > abs(m_scales[1] - scale))
{
look_backward(ft);
if (!m_added)
look_forward(ft);
}
else
{
look_forward(ft);
if (!m_added)
look_backward(ft);
}
}
};
}