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

Code style fixes.

Browse source
This commit is contained in:
vng 2012-09-20 18:37:59 +03:00 • committed by Alex Zolotarev
parent bb165f2472
commit 591a3633ba
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
map/location_state.cpp
View file

@ -328,8 +328,8 @@ namespace location
if (m_hasPosition)
{
m2::PointD const pxPosition = m_framework->GetNavigator().GtoP(Position());
double const pxErrorRadius = pxPosition.Length(m_framework->GetNavigator().GtoP(Position() + m2::PointD(m_errorRadius, 0.0)));
double const orientationRadius = max(pxErrorRadius, 30.0 * visualScale());
double const pxErrorRadius = pxPosition.Length(
m_framework->GetNavigator().GtoP(Position() + m2::PointD(m_errorRadius, 0.0)));
double screenAngle = m_framework->GetNavigator().Screen().GetAngle();
@ -346,19 +346,21 @@ namespace location
if (m_hasCompass)
{
double const orientationRadius = max(pxErrorRadius, 30.0 * visualScale());
// 0 angle is for North ("up"), but in our coordinates it's to the right.
double headingRad = m_compassFilter.GetHeadingRad() - math::pi / 2.0;
double const headingRad = m_compassFilter.GetHeadingRad() - math::pi / 2.0;
double const halfErrorRad = m_compassFilter.GetHeadingHalfErrorRad();
r->drawSector(pxPosition,
screenAngle + headingRad - m_compassFilter.GetHeadingHalfErrorRad(),
screenAngle + headingRad + m_compassFilter.GetHeadingHalfErrorRad(),
screenAngle + headingRad - halfErrorRad,
screenAngle + headingRad + halfErrorRad,
orientationRadius,
m_compassAreaColor,
depth());
r->fillSector(pxPosition,
screenAngle + headingRad - m_compassFilter.GetHeadingHalfErrorRad(),
screenAngle + headingRad + m_compassFilter.GetHeadingHalfErrorRad(),
screenAngle + headingRad - halfErrorRad,
screenAngle + headingRad + halfErrorRad,
orientationRadius,
m_compassBorderColor,
depth() - 1);