pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Bugfix in GetTurnDirection with sorting nodes. An unnecessary assert was removed

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2014-12-10 16:10:03 +03:00 • committed by Alex Zolotarev
parent 49ff59a35b
commit 8ee575e7f1
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
routing/osrm_router.cpp
View file

@ -694,8 +694,7 @@ m2::PointD OsrmRouter::GetPointForTurnAngle(OsrmFtSegMapping::FtSeg const &seg,
m2::PointD pnt = turnPnt, nextPnt;
const size_t segDist = abs(seg.m_pointEnd - seg.m_pointStart);
ASSERT_LESS(segDist, ft.GetPointsCount(),
("GetPntForTurnAngle(). The start and the end pnt of a segment are too far from each other"));
ASSERT_LESS(segDist, ft.GetPointsCount(), ());
const size_t usedFtPntNum = min(maxPntsNum, segDist);
for (size_t i = 1; i <= usedFtPntNum; ++i)
@ -792,9 +791,21 @@ void OsrmRouter::GetPossibleTurns(NodeID node,
candidates.emplace_back(a, trg);
}
sort(candidates.begin(), candidates.end(), [](TurnCandidate const & t1, TurnCandidate const & t2) { return t1.m_angle < t2.m_angle; });
auto last = unique(candidates.begin(), candidates.end());
sort(candidates.begin(), candidates.end(), [](TurnCandidate const & t1, TurnCandidate const & t2)
{
return t1.m_node < t2.m_node;
});
auto last = unique(candidates.begin(), candidates.end(), [](TurnCandidate const & t1, TurnCandidate const & t2)
{
return t1.m_node == t2.m_node;
});
candidates.erase(last, candidates.end());
sort(candidates.begin(), candidates.end(), [](TurnCandidate const & t1, TurnCandidate const & t2)
{
return t1.m_angle < t2.m_angle;
});
}

5
routing/osrm_router.hpp
View file

@ -46,11 +46,6 @@ public:
: m_angle(a), m_node(n)
{
}
bool operator == (TurnCandidate const & other) const
{
return m_node == other.m_node;
}
};
typedef vector<TurnCandidate> TurnCandidatesT;