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

removed priority hack

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-03-13 17:29:18 +03:00 • committed by Alex Zolotarev
parent 31d18d4ac6
commit c216ba86d1
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
map/feature_styler.cpp
View file

@ -82,10 +82,7 @@ namespace feature
int layer = f.GetLayer();
bool isTransparent = false;
if (layer == feature::LAYER_TRANSPARENT_TUNNEL)
{
layer = 0;
isTransparent = true;
}
bool hasIcon = false;
bool hasCaptionWithoutOffset = false;
@ -100,20 +97,7 @@ namespace feature
depth = (layer * drule::layer_base_priority) + fmod(depth, drule::layer_base_priority);
if (keys[i].m_type == drule::symbol)
{
depth = 16000;
hasIcon = true;
}
if (keys[i].m_type == drule::caption)
{
depth = 15000;
if (m_geometryType == GEOM_POINT)
depth = 15500;
}
if (keys[i].m_type == drule::pathtext)
depth = 17000;
if ((keys[i].m_type == drule::caption)
|| (keys[i].m_type == drule::symbol)
@ -124,10 +108,10 @@ namespace feature
// show labels of larger objects first
depth += priorityModifier;
}
else
else if (keys[i].m_type == drule::area)
{
// show smaller polygons on top
depth += (1 - priorityModifier);
depth -= priorityModifier;
}
if (!m_hasLineStyles && (keys[i].m_type == drule::line))