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

[map] removed unnecessary constraints

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-05-01 19:19:51 +03:00 • committed by Alex Zolotarev
parent 51715e6d8f
commit 5faf37b682
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
map/proto_to_styles.cpp
View file

@ -106,7 +106,7 @@ void ConvertStyle(SymbolRuleProto const * pSrc, graphics::Icon::Info & dest)
void ConvertStyle(CircleRuleProto const * pSrc, double scale, graphics::Circle::Info & dest)
{
dest = graphics::Circle::Info(min(max(pSrc->radius(), 3.0), 6.0) * scale,
dest = graphics::Circle::Info(pSrc->radius() * scale,
ConvertColor(pSrc->color()));
if (pSrc->has_border())
@ -122,8 +122,7 @@ void ConvertStyle(CircleRuleProto const * pSrc, double scale, graphics::Circle::
void ConvertStyle(CaptionDefProto const * pSrc, double scale, graphics::FontDesc & dest, m2::PointD & offset)
{
uint8_t const h = max(static_cast<int>(pSrc->height() * scale),
static_cast<int>(8 * scale)); // replace 12 to 8 as it defined in drawing rules
uint8_t const h = static_cast<int>(pSrc->height() * scale);
offset = m2::PointD(0,0);
if (pSrc->has_offset_x())