diff options
author | Viktor Govako <viktor.govako@gmail.com> | 2015-11-30 18:37:00 +0300 |
---|---|---|
committer | Viktor Govako <viktor.govako@gmail.com> | 2015-11-30 18:37:00 +0300 |
commit | ba0fea3aafbe888453e1fddca6299ceb1fc34e42 (patch) | |
tree | 11ebb85d5fbdda7cd335f929f035c4b7e348883f /routing/routing_session.hpp | |
parent | f7f1352efdd9ae8e26bd57d239cb86cd9d4b6910 (diff) | |
parent | ac7940a17a52724d9a246e330b5c3edba17e515c (diff) |
Merge pull request #696 from rokuz/drape-2.0
[DO NOT MERGE] Drape 2.0
Diffstat (limited to 'routing/routing_session.hpp')
-rw-r--r-- | routing/routing_session.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/routing/routing_session.hpp b/routing/routing_session.hpp index 270cdb2240..aaa3773fdc 100644 --- a/routing/routing_session.hpp +++ b/routing/routing_session.hpp @@ -90,14 +90,16 @@ public: bool IsOnRoute() const { return (m_state == OnRoute); } void Reset(); - State OnLocationPositionChanged(m2::PointD const & position, location::GpsInfo const & info, - Index const & index); + Route const & GetRoute() const { return m_route; } + + State OnLocationPositionChanged(location::GpsInfo const & info, Index const & index); void GetRouteFollowingInfo(location::FollowingInfo & info) const; void MatchLocationToRoute(location::GpsInfo & location, location::RouteMatchingInfo & routeMatchingInfo) const; - bool GetMercatorDistanceFromBegin(double & distance) const; + void SetUserCurrentPosition(m2::PointD const & position); + m2::PointD const & GetUserCurrentPosition() const; void ActivateAdditionalFeatures() {} @@ -163,6 +165,7 @@ private: double m_lastDistance; int m_moveAwayCounter; m2::PointD m_lastGoodPosition; + m2::PointD m_userCurrentPosition; // Sound turn notification parameters. turns::sound::NotificationManager m_turnNotificationsMgr; |