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

Short single feature routing crash fix.

Browse source
This commit is contained in:
Lev Dragunov 2016-01-07 15:44:35 +03:00
parent fe324b8841
commit 4cde67e0ea
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
routing/osrm2feature_map.cpp
View file

@ -118,8 +118,7 @@ bool IsInside(FtSeg const & bigSeg, FtSeg const & smallSeg)
auto segmentLeft = min(bigSeg.m_pointStart, bigSeg.m_pointEnd);
auto segmentRight = max(bigSeg.m_pointStart, bigSeg.m_pointEnd);
return (smallSeg.m_pointStart != segmentLeft || smallSeg.m_pointEnd != segmentRight) &&
(segmentLeft <= smallSeg.m_pointStart && segmentRight >= smallSeg.m_pointEnd);
return (segmentLeft <= smallSeg.m_pointStart && segmentRight >= smallSeg.m_pointEnd);
}
FtSeg SplitSegment(FtSeg const & segment, FtSeg const & splitter)

4
routing/osrm2feature_map.hpp
View file

@ -88,8 +88,8 @@ namespace OsrmMappingTypes
};
#pragma pack (pop)
/// Checks if a smallSeg is inside a bigSeg and at least one point of a smallSeg differs from
/// point of a bigSeg. Note that the smallSeg must be an ordered segment with 1 point length.
/// Checks if a smallSeg is inside a bigSeg. Note that the smallSeg must be an ordered segment
/// with 1 point length.
bool IsInside(FtSeg const & bigSeg, FtSeg const & smallSeg);
/// Splits segment by splitter segment and takes part of it.

1
routing/osrm_helpers.cpp
View file

@ -128,6 +128,7 @@ void Point2PhantomNode::CalculateWeight(OsrmMappingTypes::FtSeg const & seg,
}
}
ASSERT(foundSeg, ("Intersection not found!"));
ASSERT_GREATER(fullDistanceM, 0, ("No valid segments on the edge."));
double const ratio = (fullDistanceM == 0) ? 0 : distanceM / fullDistanceM;
ASSERT_LESS_OR_EQUAL(ratio, 1., ());