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

Fixed typo.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-09-19 16:20:56 +03:00 • committed by Alex Zolotarev
parent 547b50dce4
commit 8e888e789d
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -1113,7 +1113,7 @@ extern "C"
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_Framework_nativeIsRoutingActive(JNIEnv * env, jclass thiz)
{
return g_framework->NativeFramework()->IsRountingActive();
return g_framework->NativeFramework()->IsRoutingActive();
}
JNIEXPORT void JNICALL

10
map/framework.cpp
View file

@ -674,7 +674,7 @@ void Framework::DrawAdditionalInfo(shared_ptr<PaintEvent> const & e)
bool const isCompassEnabled = my::Abs(ang::GetShortestDistance(m_navigator.Screen().GetAngle(), 0.0)) > my::DegToRad(3.0);
bool const isCompasActionEnabled = m_informationDisplay.isCompassArrowEnabled() && m_navigator.InAction();
bool const isInRouting = IsRountingActive();
bool const isInRouting = IsRoutingActive();
m_informationDisplay.enableCompassArrow(!isInRouting && (isCompassEnabled || isCompasActionEnabled));
m_informationDisplay.setCompassArrowAngle(m_navigator.Screen().GetAngle());
@ -1811,7 +1811,7 @@ bool Framework::GetGuideInfo(storage::TIndex const & index, guides::GuideInfo &
///////////////////////////// ROUTING /////////////////////////////////////////////////
bool Framework::IsRountingActive() const
bool Framework::IsRoutingActive() const
{
return m_routingSession.IsActive();
}
@ -1822,7 +1822,7 @@ bool Framework::StartRoutingSession(m2::PointD const & destination)
if (!GetPlatform().HasRouting() || !state->IsModeHasPosition())
return false;
if (IsRountingActive())
if (IsRoutingActive())
CancelRoutingSession();
m_routingSession.BuildRoute(state->Position(), destination,
@ -1837,7 +1837,7 @@ bool Framework::StartRoutingSession(m2::PointD const & destination)
void Framework::CancelRoutingSession()
{
ASSERT(IsRountingActive(), ());
ASSERT(IsRoutingActive(), ());
GetLocationState()->StopRoutingMode();
m_routingSession.Reset();
@ -1889,7 +1889,7 @@ void Framework::InsertRoute(routing::Route const & route)
void Framework::CheckLocationForRouting()
{
if (!IsRountingActive())
if (!IsRoutingActive())
return;
shared_ptr<location::State> const & state = GetLocationState();

2
map/framework.hpp
View file

@ -480,7 +480,7 @@ public:
public:
/// @name Routing mode
//@{
bool IsRountingActive() const;
bool IsRoutingActive() const;
bool StartRoutingSession(m2::PointD const & destination);
void CancelRoutingSession();

2
qt/draw_widget.cpp
View file

@ -392,7 +392,7 @@ namespace qt
}
else if (e->modifiers() & Qt::ShiftModifier)
{
if (m_framework->IsRountingActive())
if (m_framework->IsRoutingActive())
m_framework->CancelRoutingSession();
else
m_framework->StartRoutingSession(m_framework->PtoG(pt));