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

On edge cross mwm intersection lookup.

Browse source
This commit is contained in:
Lev Dragunov 2016-02-25 17:05:51 +03:00 • committed by Sergey Yershov
parent cae66f266d
commit c7a6dc1aba
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
routing/osrm_helpers.cpp
View file

@ -11,14 +11,14 @@ namespace helpers
{
// static
void Point2PhantomNode::FindNearestSegment(FeatureType const & ft, m2::PointD const & point,
Candidate & res)
Candidate & res, size_t start_idx, size_t stop_idx)
{
ft.ParseGeometry(FeatureType::BEST_GEOMETRY);
size_t const count = ft.GetPointsCount();
size_t const count = min(ft.GetPointsCount() - 1, stop_idx);
uint32_t const featureId = ft.GetID().m_index;
ASSERT_GREATER(count, 1, ());
for (size_t i = 1; i < count; ++i)
ASSERT_GREATER_OR_EQUAL(count, 1, ());
for (size_t i = start_idx + 1; i <= count; ++i)
{
m2::ProjectionToSection<m2::PointD> segProj;
segProj.SetBounds(ft.GetPoint(i - 1), ft.GetPoint(i));

3
routing/osrm_helpers.hpp
View file

@ -37,7 +37,8 @@ public:
};
// Finds nearest segment to a feature geometry.
static void FindNearestSegment(FeatureType const & ft, m2::PointD const & point, Candidate & res);
static void FindNearestSegment(FeatureType const & ft, m2::PointD const & point, Candidate & res,
size_t start_idx = 0, size_t stop_idx = numeric_limits<size_t>::max());
// Sets point from where weights are calculated.
void SetPoint(m2::PointD const & pt) { m_point = pt; }

4
routing/osrm_router.cpp
View file

@ -115,7 +115,9 @@ void FindGraphNodeOffsets(uint32_t const nodeId, m2::PointD const & point,
loader.GetFeatureByIndex(s.m_fid, ft);
helpers::Point2PhantomNode::Candidate mappedSeg;
helpers::Point2PhantomNode::FindNearestSegment(ft, point, mappedSeg);
size_t start_idx = min(s.m_pointStart, s.m_pointEnd);
size_t stop_idx = max(s.m_pointStart, s.m_pointEnd);
helpers::Point2PhantomNode::FindNearestSegment(ft, point, mappedSeg, start_idx, stop_idx);
OsrmMappingTypes::FtSeg seg;
seg.m_fid = mappedSeg.m_fid;