make circular detection covered again

This commit is contained in:
Moritz Kobitzsch
2017-10-23 05:31:10 +02:00
committed by Michael Krasnyk
parent 704cf314d4
commit 910ee0829f
2 changed files with 17 additions and 25 deletions
@@ -109,13 +109,8 @@ bool MergableRoadDetector::CanMergeRoad(const NodeID intersection_node,
return true;
// finally check if two roads describe the direction
if (HaveSameDirection(intersection_node, lhs, rhs))
{
// do not merge traffic circles and similar
return !IsCircularShape(intersection_node, lhs, rhs);
}
else
return false;
return HaveSameDirection(intersection_node, lhs, rhs) &&
!IsCircularShape(intersection_node, lhs, rhs);
}
bool MergableRoadDetector::HaveIdenticalNames(const NameID lhs, const NameID rhs) const