From e9d71d22b055a89168c8af8265c3d9172c28395a Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Thu, 28 Apr 2016 17:17:18 +0300 Subject: [PATCH] Revert. Preparing for bugfix. Different current position in case of routing start point and current position. --- map/framework.cpp | 7 +------ map/framework.hpp | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/map/framework.cpp b/map/framework.cpp index e25aa83f8e..a756028db0 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2124,18 +2124,13 @@ int64_t Framework::GetCurrentDataVersion() return m_storage.GetCurrentDataVersion(); } -bool Framework::GetMyPosition(m2::PointD & myPosition) -{ - return m_drapeEngine->GetMyPosition(myPosition); -} - void Framework::BuildRoute(m2::PointD const & finish, uint32_t timeoutSec) { ASSERT_THREAD_CHECKER(m_threadChecker, ("BuildRoute")); ASSERT(m_drapeEngine != nullptr, ()); m2::PointD start; - if (!GetMyPosition(start)) + if (!m_drapeEngine->GetMyPosition(start)) { CallRouteBuilded(IRouter::NoCurrentPosition, storage::TCountriesVec()); return; diff --git a/map/framework.hpp b/map/framework.hpp index 4e0818ad5d..37db171473 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -317,7 +317,6 @@ public: void OnLocationUpdate(location::GpsInfo const & info); void OnCompassUpdate(location::CompassInfo const & info); void SwitchMyPositionNextMode(); - bool GetMyPosition(m2::PointD & myPosition); /// Should be set before Drape initialization. Guarantees that fn is called in main thread context. void SetMyPositionModeListener(location::TMyPositionModeChanged && fn);