From d6a1769bbad1936d843248b9528758879e02d21a Mon Sep 17 00:00:00 2001 From: tatiana-kondakova Date: Wed, 16 Aug 2017 17:54:32 +0300 Subject: [PATCH] fix route tests: allow empty m_subrouteAttrs for routes without intermediate points --- routing/route.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/routing/route.hpp b/routing/route.hpp index 1fa370c384..6eee5e0acf 100644 --- a/routing/route.hpp +++ b/routing/route.hpp @@ -163,9 +163,14 @@ public: } else { - ASSERT_GREATER(m_subrouteAttrs.size(), m_currentSubrouteIdx, ()); FollowedPolyline(beg, end).Swap(m_poly); - m_poly.SetNextCheckpointIndex(m_subrouteAttrs[m_currentSubrouteIdx].GetEndSegmentIdx()); + // If there are no intermediate points it's acceptable to have an empty m_subrouteAttrs. + // Constructed m_poly will have the last point index as next checkpoint index, it's right. + if (!m_subrouteAttrs.empty()) + { + ASSERT_GREATER(m_subrouteAttrs.size(), m_currentSubrouteIdx, ()); + m_poly.SetNextCheckpointIndex(m_subrouteAttrs[m_currentSubrouteIdx].GetEndSegmentIdx()); + } } }