kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[routing] Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-08-05 14:46:28 +03:00 • committed by Aleksey Belousov
parent 8cd247848f
commit 1f0f8e863e
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
routing/index_router.cpp
View file

@ -882,7 +882,7 @@ bool IndexRouter::IsFencedOff(m2::PointD const & point, pair<Edge, Junction> con
}
void IndexRouter::RoadsToNearestEdges(m2::PointD const & point,
vector<IRoadGraph::FullRoadInfo> const & roads, uint32_t count,
vector<IRoadGraph::FullRoadInfo> const & roads,
IsEdgeProjGood const & isGood,
vector<pair<Edge, Junction>> & 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<pair<Edge, Junction>> candidates;
RoadsToNearestEdges(point, closestRoads, kMaxRoadCandidates, isGood, candidates);
RoadsToNearestEdges(point, closestRoads, isGood, candidates);
if (candidates.empty())
return false;

2
routing/index_router.hpp
View file

@ -117,7 +117,7 @@ private:
std::vector<IRoadGraph::FullRoadInfo> const & fences) const;
void RoadsToNearestEdges(m2::PointD const & point,
std::vector<IRoadGraph::FullRoadInfo> const & roads, uint32_t count,
std::vector<IRoadGraph::FullRoadInfo> const & roads,
IsEdgeProjGood const & isGood,
std::vector<std::pair<Edge, Junction>> & edgeProj) const;