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

[routing] Minor fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-07-05 10:58:49 +03:00 • committed by Vlad Mihaylenko
parent b9815f7236
commit 5dcdc2d25c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openlr/router.cpp
View file

@ -176,7 +176,7 @@ bool Router::Init(std::vector<WayPoint> const & points, double positiveOffsetM,
m_graph.FindClosestEdges(
MercatorBounds::RectByCenterXYAndSizeInMeters(
m_points[i].m_point, routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
kMaxRoadCandidates, nullptr, vicinity);
kMaxRoadCandidates, nullptr /* isGoodFeature */, vicinity);
for (auto const & v : vicinity)
{
auto const & e = v.first;
@ -197,7 +197,7 @@ bool Router::Init(std::vector<WayPoint> const & points, double positiveOffsetM,
m_graph.FindClosestEdges(
MercatorBounds::RectByCenterXYAndSizeInMeters(
m_sourceJunction.GetPoint(), routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
kMaxRoadCandidates, nullptr, sourceVicinity);
kMaxRoadCandidates, nullptr /* isGoodFeature */, sourceVicinity);
m_graph.AddFakeEdges(m_sourceJunction, sourceVicinity);
}
@ -207,7 +207,7 @@ bool Router::Init(std::vector<WayPoint> const & points, double positiveOffsetM,
m_graph.FindClosestEdges(
MercatorBounds::RectByCenterXYAndSizeInMeters(
m_targetJunction.GetPoint(), routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
kMaxRoadCandidates, nullptr, targetVicinity);
kMaxRoadCandidates, nullptr /* isGoodFeature */, targetVicinity);
m_graph.AddFakeEdges(m_targetJunction, targetVicinity);
}
@ -500,7 +500,7 @@ void Router::ForEachNonFakeClosestEdge(Vertex const & u, FunctionalRoadClass con
m_graph.FindClosestEdges(
MercatorBounds::RectByCenterXYAndSizeInMeters(
u.m_junction.GetPoint(), routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
kMaxRoadCandidates, nullptr, vicinity);
kMaxRoadCandidates, nullptr /* isGoodFeature */, vicinity);
for (auto const & p : vicinity)
{