diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 5507d1ee38..a23bbe4882 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -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 diff --git a/map/framework.cpp b/map/framework.cpp index d4fd088dec..b25b100394 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -674,7 +674,7 @@ void Framework::DrawAdditionalInfo(shared_ptr 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 const & state = GetLocationState(); diff --git a/map/framework.hpp b/map/framework.hpp index c36a358717..afd11024c1 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -480,7 +480,7 @@ public: public: /// @name Routing mode //@{ - bool IsRountingActive() const; + bool IsRoutingActive() const; bool StartRoutingSession(m2::PointD const & destination); void CancelRoutingSession(); diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index f9fe273c68..a525830543 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -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));