From 1f0f8e863e68a854d4390326e1ae2962d89bcece Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Mon, 5 Aug 2019 14:46:28 +0300 Subject: [PATCH] [routing] Review fixes. --- routing/index_router.cpp | 9 ++++----- routing/index_router.hpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/routing/index_router.cpp b/routing/index_router.cpp index 0b555e2c2d..b4036f557d 100644 --- a/routing/index_router.cpp +++ b/routing/index_router.cpp @@ -882,7 +882,7 @@ bool IndexRouter::IsFencedOff(m2::PointD const & point, pair con } void IndexRouter::RoadsToNearestEdges(m2::PointD const & point, - vector const & roads, uint32_t count, + vector const & roads, IsEdgeProjGood const & isGood, vector> & edgeProj) const { @@ -890,7 +890,7 @@ void IndexRouter::RoadsToNearestEdges(m2::PointD const & point, for (auto const & road : roads) finder.AddInformationSource(road); - finder.MakeResult(edgeProj, count); + finder.MakeResult(edgeProj, kMaxRoadCandidates); } Segment IndexRouter::GetSegmentByEdge(Edge const & edge) const @@ -1016,10 +1016,9 @@ bool IndexRouter::FindBestEdges(m2::PointD const & point, return !IsFencedOff(point, edgeProj, closestRoads); }; - // Getting |kMaxRoadCandidates| closest edges from |closestRoads| if they are correct - // according to isGood() function. + // Getting closest edges from |closestRoads| if they are correct according to isGood() function. vector> candidates; - RoadsToNearestEdges(point, closestRoads, kMaxRoadCandidates, isGood, candidates); + RoadsToNearestEdges(point, closestRoads, isGood, candidates); if (candidates.empty()) return false; diff --git a/routing/index_router.hpp b/routing/index_router.hpp index 6eadf8a93b..17854550a6 100644 --- a/routing/index_router.hpp +++ b/routing/index_router.hpp @@ -117,7 +117,7 @@ private: std::vector const & fences) const; void RoadsToNearestEdges(m2::PointD const & point, - std::vector const & roads, uint32_t count, + std::vector const & roads, IsEdgeProjGood const & isGood, std::vector> & edgeProj) const;