From e0426005e786406c39fe064f4b0e623fb35fc2f5 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Fri, 21 Jul 2017 17:28:40 +0300 Subject: [PATCH] Review fixes. --- routing/base/followed_polyline.cpp | 4 ++-- routing/base/followed_polyline.hpp | 2 +- routing/route.cpp | 23 +++++++++---------- routing/route.hpp | 4 ++-- .../routing_tests/followed_polyline_test.cpp | 4 ++-- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/routing/base/followed_polyline.cpp b/routing/base/followed_polyline.cpp index 5f5e8f75c5..d13a663978 100644 --- a/routing/base/followed_polyline.cpp +++ b/routing/base/followed_polyline.cpp @@ -51,7 +51,7 @@ double FollowedPolyline::GetTotalDistanceMeters() const return m_segDistance.back(); } -double FollowedPolyline::GetDistanceFromBeginMeters() const +double FollowedPolyline::GetDistanceFromStartMeters() const { if (!IsValid() || !m_current.IsValid()) { @@ -66,7 +66,7 @@ double FollowedPolyline::GetDistanceFromBeginMeters() const double FollowedPolyline::GetDistanceToEndMeters() const { - return GetTotalDistanceMeters() - GetDistanceFromBeginMeters(); + return GetTotalDistanceMeters() - GetDistanceFromStartMeters(); } void FollowedPolyline::Swap(FollowedPolyline & rhs) diff --git a/routing/base/followed_polyline.hpp b/routing/base/followed_polyline.hpp index 84d9e0d7eb..55c56e92b9 100644 --- a/routing/base/followed_polyline.hpp +++ b/routing/base/followed_polyline.hpp @@ -31,7 +31,7 @@ public: m2::PolylineD const & GetPolyline() const { return m_poly; } vector const & GetSegDistanceMeters() const { return m_segDistance; } double GetTotalDistanceMeters() const; - double GetDistanceFromBeginMeters() const; + double GetDistanceFromStartMeters() const; double GetDistanceToEndMeters() const; double GetDistFromCurPointToRoutePointMerc() const; double GetDistFromCurPointToRoutePointMeters() const; diff --git a/routing/route.cpp b/routing/route.cpp index 4d963b1ae4..80a436664f 100644 --- a/routing/route.cpp +++ b/routing/route.cpp @@ -75,7 +75,7 @@ double Route::GetCurrentDistanceFromBeginMeters() const { if (!m_poly.IsValid()) return 0.0; - return m_poly.GetDistanceFromBeginMeters(); + return m_poly.GetDistanceFromStartMeters(); } double Route::GetCurrentDistanceToEndMeters() const @@ -101,7 +101,7 @@ double Route::GetMercatorDistanceFromBegin() const double Route::GetTotalTimeSec() const { - return m_routeSegments.empty() ? 0 : m_routeSegments.back().GetTimeFromBeginningS(); + return m_routeSegments.empty() ? 0 : m_routeSegments.back().GetTimeFromBeginningSec(); } double Route::GetCurrentTimeToEndSec() const @@ -119,7 +119,7 @@ double Route::GetCurrentTimeToEndSec() const if (my::AlmostEqualAbs(curSegLenMeters, 0.0, 1.0 /* meters */)) return totalTimeS - etaToLastPassedPointS; - double const curSegTimeS = GetTimeToPassSegS(curIter.m_ind); + double const curSegTimeS = GetTimeToPassSegSec(curIter.m_ind); CHECK_GREATER(curSegTimeS, 0, ("Route can't contain segments with infinite speed.")); double const curSegSpeedMPerS = curSegLenMeters / curSegTimeS; @@ -130,7 +130,6 @@ double Route::GetCurrentTimeToEndSec() const void Route::GetCurrentStreetName(string & name) const { - name.clear(); GetStreetNameAfterIdx(static_cast(m_poly.GetCurrentIter().m_ind), name); } @@ -149,10 +148,10 @@ void Route::GetStreetNameAfterIdx(uint32_t idx, string & name) const if (i == 0) continue; - string const n = m_routeSegments[ConvertPointIdxToSegmentIdx(i)].GetStreet(); - if (!n.empty()) + string const street = m_routeSegments[ConvertPointIdxToSegmentIdx(i)].GetStreet(); + if (!street.empty()) { - name = n; + name = street; return; } auto const furtherIter = m_poly.GetIterToIndex(i); @@ -322,7 +321,7 @@ bool Route::IsSubroutePassed(size_t subrouteIdx) const size_t const segmentIdx = GetSubrouteAttrs(subrouteIdx).GetEndSegmentIdx() - 1; CHECK_LESS(segmentIdx, m_routeSegments.size(), ()); double const lengthMeters = m_routeSegments[segmentIdx].GetDistFromBeginningMeters(); - double const passedDistanceMeters = m_poly.GetDistanceFromBeginMeters(); + double const passedDistanceMeters = m_poly.GetDistanceFromStartMeters(); return lengthMeters - passedDistanceMeters < kOnEndToleranceM; } @@ -355,11 +354,11 @@ void Route::GetTurnsForTesting(vector & turns) const } } -double Route::GetTimeToPassSegS(size_t segIdx) const +double Route::GetTimeToPassSegSec(size_t segIdx) const { CHECK_LESS(segIdx, m_routeSegments.size(), ()); - return m_routeSegments[segIdx].GetTimeFromBeginningS() - - (segIdx == 0 ? 0.0 : m_routeSegments[segIdx - 1].GetTimeFromBeginningS()); + return m_routeSegments[segIdx].GetTimeFromBeginningSec() - + (segIdx == 0 ? 0.0 : m_routeSegments[segIdx - 1].GetTimeFromBeginningSec()); } double Route::GetSegLenMeters(size_t segIdx) const @@ -376,7 +375,7 @@ double Route::GetETAToLastPassedPointSec() const CHECK(curIter.IsValid(), ()); CHECK_LESS(curIter.m_ind, m_routeSegments.size(), ()); - return curIter.m_ind == 0 ? 0.0 : m_routeSegments[curIter.m_ind - 1].GetTimeFromBeginningS(); + return curIter.m_ind == 0 ? 0.0 : m_routeSegments[curIter.m_ind - 1].GetTimeFromBeginningSec(); } string DebugPrint(Route const & r) diff --git a/routing/route.hpp b/routing/route.hpp index 1cb53c41ae..df13be8680 100644 --- a/routing/route.hpp +++ b/routing/route.hpp @@ -55,7 +55,7 @@ public: std::string const & GetStreet() const { return m_street; } double GetDistFromBeginningMeters() const { return m_distFromBeginningMeters; } double GetDistFromBeginningMerc() const { return m_distFromBeginningMerc; } - double GetTimeFromBeginningS() const { return m_timeFromBeginningS; } + double GetTimeFromBeginningSec() const { return m_timeFromBeginningS; } traffic::SpeedGroup GetTraffic() const { return m_traffic; } private: @@ -284,7 +284,7 @@ private: size_t ConvertPointIdxToSegmentIdx(size_t pointIdx) const; /// \returns Estimated time to pass the route segment with |segIdx|. - double GetTimeToPassSegS(size_t segIdx) const; + double GetTimeToPassSegSec(size_t segIdx) const; /// \returns Length of the route segment with |segIdx| in meters. double GetSegLenMeters(size_t segIdx) const; /// \returns ETA to the last passed route point in seconds. diff --git a/routing/routing_tests/followed_polyline_test.cpp b/routing/routing_tests/followed_polyline_test.cpp index a84acd28b0..db3f3aa743 100644 --- a/routing/routing_tests/followed_polyline_test.cpp +++ b/routing/routing_tests/followed_polyline_test.cpp @@ -111,8 +111,8 @@ UNIT_TEST(FollowedPolylineGetDistanceFromBeginM) FollowedPolyline polyline(testPolyline.Begin(), testPolyline.End()); m2::PointD point(4, 0); polyline.UpdateProjection(MercatorBounds::RectByCenterXYAndSizeInMeters(point, 2)); - double distance = polyline.GetDistanceFromBeginMeters(); - double masterDistance = MercatorBounds::DistanceOnEarth(kTestDirectedPolyline.Front(), + double const distance = polyline.GetDistanceFromStartMeters(); + double const masterDistance = MercatorBounds::DistanceOnEarth(kTestDirectedPolyline.Front(), point); TEST_ALMOST_EQUAL_ULPS(distance, masterDistance, ()); }