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

[OpenLR] Avoid routes with two adjacent fake edges.

Browse source
This commit is contained in:
Sergey Magidovich 2018-01-26 16:04:37 +03:00 • committed by Yuri Gorshenin
parent fd73e7d0d9
commit b99673f4e6
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openlr/candidate_paths_getter.cpp
View file

@ -219,6 +219,10 @@ void CandidatePathsGetter::GetAllSuitablePaths(Graph::EdgeVector const & startLi
for (auto const & e : edges)
{
// Fake edges are allowed only at the start/end of the path.
if (e.IsFake())
continue;
if (EdgesAreAlmostEqual(e.GetReverseEdge(), currentEdge))
continue;

5
openlr/paths_connector.cpp
View file

@ -196,6 +196,11 @@ bool PathsConnector::FindShortestPath(Graph::Edge const & from, Graph::Edge cons
{
// TODO(mgsergio): Use frc to filter edges.
// Only start and/or end of the route can be fake.
// Routes made only of fake edges are no used to us.
if (u.IsFake() && e.IsFake())
continue;
auto const it = scores.find(e);
auto const eScore = us + EdgeLength(e);
if (it == end(scores) || it->second > eScore)