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

Set minimal scale level for text-mask drawing.

Browse source 
Remove obsolete xml-style.
This commit is contained in:
vng 2011-01-15 19:29:22 +02:00 • committed by Alex Zolotarev
parent 2711ee5263
commit e9d066d2b3
2 changed files with 12 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
data/styles/osm-map.xml
View file

@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Tiles@Home Rules File for zoom level 7 -->
<rules>
<rule e="way" k="natural" v="coastline">
<area class="natural-coastline-area"/>
<line class="natural-coastline-core"/>
</rule>
<rule e="way" k="boundary" v="administrative">
<rule e="way" k="admin_level" v="2">
<line class="boundary boundary-administrative-state-casing"/>
<line class="boundary boundary-administrative-state-core"/>
</rule>
</rule>
<rule e="node" k="place" v="city|town">
<rule e="node" k="capital" v="yes">
<text k="name" class='caption-casing capital-caption-casing' />
<text k="name" class='caption-core capital-caption' />
</rule>
</rule>
<defs>
<style xmlns="http://www.w3.org/2000/svg" id="styles" type="text/css">
.boundary {
stroke-linecap: butt;
stroke-linejoin: round;
fill: none;
}
.boundary-administrative-state-casing {
stroke-width: 80px;
stroke: #ffff00;
opacity: 0.5;
}
.boundary-administrative-state-core {
stroke-width: 16px;
stroke: #f9574b;
stroke-dasharray: 80, 16, 16, 16;
}
.natural-coastline-area {
fill: #b5d6f1;
}
.natural-coastline-core {
stroke: #b5d6f1;
stroke-width: 10px;
}
.caption-casing {
fill: white;
stroke: white;
font-family: "DejaVu Sans";
font-weight: normal;
text-anchor: middle;
stroke-miterlimit: 1.5;
}
.caption-core {
stroke: white;
stroke-width: 0px;
font-family: "DejaVu Sans";
font-weight: normal;
text-anchor: middle;
stroke-miterlimit: 1.5;
}
.capital-caption-casing { font-size: 4000px; stroke-width: 900px; }
.capital-caption { font-size: 4000px; }
</style>
</defs>
</rules>

18
map/drawer_yg.cpp
View file

@ -147,18 +147,22 @@ void DrawerYG::drawArea(vector<m2::PointD> const & pts, rule_ptr_t pRule, int de
m_pScreen->drawTrianglesList(&pts[0], pts.size()/*, res*/, id, depth);
}
namespace { double const minTextSize = 10.0; }
namespace
{
double const min_text_height = 7.99; // 8
double const min_text_height_mask = 9.99; // 10
}
uint8_t DrawerYG::get_text_font_size(rule_ptr_t pRule) const
{
double const h = pRule->GetTextHeight() * m_scale;
return my::rounds(max(h, minTextSize) * m_visualScale);
return my::rounds(max(h, min_text_height) * m_visualScale);
}
uint8_t DrawerYG::get_pathtext_font_size(rule_ptr_t pRule) const
{
double const h = pRule->GetTextHeight() * m_scale - 2.0;
return my::rounds(max(h, minTextSize) * m_visualScale);
return my::rounds(max(h, min_text_height) * m_visualScale);
}
void DrawerYG::drawText(m2::PointD const & pt, string const & name, rule_ptr_t pRule, int depth)
@ -168,9 +172,11 @@ void DrawerYG::drawText(m2::PointD const & pt, string const & name, rule_ptr_t p
bool DrawerYG::drawPathText(di::PathInfo const & info, string const & name, uint8_t fontSize, int /*depth*/)
{
return m_pScreen->drawPathText( &info.m_path[0], info.m_path.size(), fontSize, name,
info.GetLength(), info.GetOffset(),
yg::gl::Screen::middle_line, true, yg::maxDepth);
bool const isMasked = (double(fontSize) / m_visualScale >= min_text_height_mask);
return m_pScreen->drawPathText( &info.m_path[0], info.m_path.size(), fontSize, name,
info.GetLength(), info.GetOffset(),
yg::gl::Screen::middle_line, isMasked, yg::maxDepth);
}
shared_ptr<yg::gl::Screen> DrawerYG::screen() const