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

[OpenLR] Bugfix. Crash on one-edged route.

Browse source
This commit is contained in:
Sergey Magidovich 2018-01-26 18:27:51 +03:00 • committed by Yuri Gorshenin
parent 25be811a83
commit 54259598ee
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openlr/candidate_paths_getter.hpp
View file

@ -86,11 +86,9 @@ private:
bool HasFakeEndings() const { return m_path && m_path->m_hasFake; }
LinkPtr m_path = nullptr;
uint32_t m_bearingDiff = std::numeric_limits<uint32_t>::max(); // Domain is roughly [0, 30]
double m_pathDistanceDiff =
std::numeric_limits<uint32_t>::max(); // Domain is roughly [0, 25]
double m_startPointDistance =
std::numeric_limits<uint32_t>::max(); // Domain is roughly [0, 50]
uint32_t m_bearingDiff = std::numeric_limits<uint32_t>::max(); // Domain is roughly [0, 30]
double m_pathDistanceDiff = std::numeric_limits<double>::max(); // Domain is roughly [0, 25]
double m_startPointDistance = std::numeric_limits<double>::max(); // Domain is roughly [0, 50]
};
// Note: In all methods below if |isLastPoint| is true than algorithm should

3
openlr/openlr_decoder.cpp
View file

@ -124,6 +124,8 @@ void ExpandFakes(Index const & index, Graph & g, Graph::EdgeVector & path)
ASSERT(!path.empty(), ());
ExpandFake(path, begin(path), index, g);
if (path.empty())
return;
ExpandFake(path, --end(path), index, g);
}
@ -365,6 +367,7 @@ bool OpenLRDecoder::DecodeSingleSegment(LinearSegment const & segment, Index con
path.m_segmentId.Set(segment.m_segmentId);
auto const & points = segment.GetLRPs();
CHECK_GREATER(points.size(), 1, ("A segment cannot consist of less than two points"));
vector<vector<Graph::EdgeVector>> lineCandidates;
lineCandidates.reserve(points.size());
LOG(LDEBUG, ("Decoding segment:", segment.m_segmentId, "with", points.size(), "points"));