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 17:14:54 +03:00 • committed by Aleksey Belousov
parent 1f0f8e863e
commit 508077e21a
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
routing/features_road_graph.hpp
View file

@ -82,8 +82,8 @@ public:
ICrossEdgesLoader & edgesLoader) const override;
void FindClosestEdges(m2::RectD const & rect, uint32_t count,
std::vector<std::pair<Edge, Junction>> & vicinities) const override;
std::vector<IRoadGraph::FullRoadInfo> FindRoads(
m2::RectD const & rect, IsGoodFeatureFn const & isGoodFeature) const override;
std::vector<IRoadGraph::FullRoadInfo>
FindRoads(m2::RectD const & rect, IsGoodFeatureFn const & isGoodFeature) const override;
void GetFeatureTypes(FeatureID const & featureId, feature::TypesHolder & types) const override;
void GetJunctionTypes(Junction const & junction, feature::TypesHolder & types) const override;
IRoadGraph::Mode GetMode() const override;

2
routing/index_graph.cpp
View file

@ -249,6 +249,8 @@ void IndexGraph::GetSegmentCandidateForJoint(Segment const & parent, bool isOutg
if (!road.IsValid())
return;
// Note. Flag |useRoutingOptions| is not passed to this place because it's true
// for all cases in current code. So if below should be checked anyway.
if (!road.SuitableForOptions(m_avoidRoutingOptions))
return;

2
routing/index_router.cpp
View file

@ -1007,7 +1007,7 @@ bool IndexRouter::FindBestEdges(m2::PointD const & point,
// candidates if it's a dead end taking into acount routing options. We ignore candidates as well
// if they don't match RoutingOptions.
set<Segment> deadEnds;
auto const isGood = [&, this](pair<Edge, Junction> const & edgeProj){
auto const isGood = [&](pair<Edge, Junction> const & edgeProj){
auto const segment = GetSegmentByEdge(edgeProj.first);
if (IsDeadEndCached(segment, isOutgoing, true /* useRoutingOptions */, worldGraph, deadEnds))
return false;