From 4b277dc89a08046135dc5d2e5c579de122a2dc13 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Wed, 7 Aug 2019 15:24:47 +0300 Subject: [PATCH] [routing] Considering feature loose end as not-joints while looking for end edges. --- routing/index_graph.cpp | 7 ------- routing/index_graph_starter_joints.hpp | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/routing/index_graph.cpp b/routing/index_graph.cpp index b1d8ac1f06..87bbc7eaeb 100644 --- a/routing/index_graph.cpp +++ b/routing/index_graph.cpp @@ -261,14 +261,7 @@ void IndexGraph::GetSegmentCandidateForJoint(Segment const & parent, bool isOutg Joint::Id const jointId = m_roadIndex.GetJointId(roadPoint); if (jointId == Joint::kInvalidId) - { - if (IsJointOrEnd(parent, isOutgoing)) - { - // It's not a joint but a loose end of a feature. - GetSegmentCandidateForRoadPoint(roadPoint, parent.GetMwmId(), isOutgoing, children); - } return; - } m_jointIndex.ForEachPoint(jointId, [&](RoadPoint const & rp) { GetSegmentCandidateForRoadPoint(rp, parent.GetMwmId(), isOutgoing, children); diff --git a/routing/index_graph_starter_joints.hpp b/routing/index_graph_starter_joints.hpp index 9a07257420..7f012c4fbf 100644 --- a/routing/index_graph_starter_joints.hpp +++ b/routing/index_graph_starter_joints.hpp @@ -599,7 +599,7 @@ std::vector IndexGraphStarterJoints::FindFirstJoints(Segment c // or it's the real one and its end (RoadPoint) is |Joint|. if (((!IsRealSegment(segment) && m_graph.ConvertToReal(segment) && isEndOfSegment(beforeConvert, segment, fromStart)) || IsRealSegment(beforeConvert)) && - IsJointOrEnd(segment, fromStart)) + IsJoint(segment, fromStart)) { addFake(segment, beforeConvert); continue;