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

fixed uninitalized position usage.

Browse source
This commit is contained in:
rachytski 2012-10-11 16:15:57 +03:00 • committed by Alex Zolotarev
parent 14967d958d
commit c4c7570816
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
map/location_state.cpp
View file

@ -31,6 +31,8 @@ namespace location
State::State(Params const & p)
: base_t(p),
m_errorRadius(0),
m_position(0, 0),
m_hasPosition(false),
m_hasCompass(false),
m_isCentered(false),
@ -317,26 +319,29 @@ namespace location
void State::update()
{
m2::PointD const pxPosition = m_framework->GetNavigator().GtoP(Position());
setPivot(pxPosition);
double const pxErrorRadius = pxPosition.Length(m_framework->GetNavigator().GtoP(Position() + m2::PointD(m_errorRadius, 0.0)));
m2::RectD newRect(pxPosition - m2::PointD(pxErrorRadius, pxErrorRadius),
pxPosition + m2::PointD(pxErrorRadius, pxErrorRadius));
double const pxArrowRadius = m_arrowHeight * m_controller->GetVisualScale();
m2::RectD arrowRect(pxPosition - m2::PointD(pxArrowRadius, pxArrowRadius),
pxPosition + m2::PointD(pxArrowRadius, pxArrowRadius));
newRect.Add(arrowRect);
if (newRect != m_boundRect)
if (isVisible())
{
m_boundRect = newRect;
setIsDirtyRect(true);
m2::PointD const pxPosition = m_framework->GetNavigator().GtoP(Position());
setPivot(pxPosition);
double const pxErrorRadius = pxPosition.Length(m_framework->GetNavigator().GtoP(Position() + m2::PointD(m_errorRadius, 0.0)));
m2::RectD newRect(pxPosition - m2::PointD(pxErrorRadius, pxErrorRadius),
pxPosition + m2::PointD(pxErrorRadius, pxErrorRadius));
double const pxArrowRadius = m_arrowHeight * m_controller->GetVisualScale();
m2::RectD arrowRect(pxPosition - m2::PointD(pxArrowRadius, pxArrowRadius),
pxPosition + m2::PointD(pxArrowRadius, pxArrowRadius));
newRect.Add(arrowRect);
if (newRect != m_boundRect)
{
m_boundRect = newRect;
setIsDirtyRect(true);
}
}
}