diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-07-27 07:41:28 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-07-27 07:41:28 +0300 |
| commit | 8041ea570c9c80cc4515a4bcf1978981d53f65ea (patch) | |
| tree | 81f88b4d14e1b785696ea6bb2fc5b41cb2c95745 /routing | |
| parent | 6840c3c18ce58e7b0021745b46bf864468b189cd (diff) | |
Fixing routing tests.
Diffstat (limited to 'routing')
| -rw-r--r-- | routing/nearest_edge_finder.cpp | 8 | ||||
| -rw-r--r-- | routing/road_graph.cpp | 2 | ||||
| -rw-r--r-- | routing/road_graph.hpp | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/routing/nearest_edge_finder.cpp b/routing/nearest_edge_finder.cpp index d7c9c76d7f..637abc395e 100644 --- a/routing/nearest_edge_finder.cpp +++ b/routing/nearest_edge_finder.cpp @@ -41,12 +41,10 @@ void NearestEdgeFinder::AddInformationSource(FeatureID const & featureId, IRoadG // to segment [res.m_segStart.GetPoint(), res.m_segEnd.GetPoint()]. // It's necessary to calculate exact value of res.m_projPoint.GetAltitude() by this // information. - bool const isAltitude = res.m_segStart.GetAltitude() != feature::kInvalidAltitude && - res.m_segEnd.GetAltitude() != feature::kInvalidAltitude; + ASSERT_NOT_EQUAL(res.m_segStart.GetAltitude() , feature::kInvalidAltitude, ()); + ASSERT_NOT_EQUAL(res.m_segEnd.GetAltitude(), feature::kInvalidAltitude, ()); feature::TAltitude const projPointAlt = - isAltitude ? static_cast<feature::TAltitude>( - (res.m_segStart.GetAltitude() + res.m_segEnd.GetAltitude()) / 2) - : feature::kInvalidAltitude; + static_cast<feature::TAltitude>((res.m_segStart.GetAltitude() + res.m_segEnd.GetAltitude()) / 2); res.m_projPoint = Junction(pt, projPointAlt); } } diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp index 58864fa80e..52a66857e5 100644 --- a/routing/road_graph.cpp +++ b/routing/road_graph.cpp @@ -66,7 +66,7 @@ void ReverseEdges(size_t beginIdx, IRoadGraph::TEdgeVector & edges) // Junction -------------------------------------------------------------------- -Junction::Junction() : m_point(m2::PointD::Zero()), m_altitude(feature::kInvalidAltitude) {} +Junction::Junction() : m_point(m2::PointD::Zero()), m_altitude(feature::kDefautlAltitudeMeters) {} Junction::Junction(m2::PointD const & point, feature::TAltitude altitude) : m_point(point), m_altitude(altitude) {} diff --git a/routing/road_graph.hpp b/routing/road_graph.hpp index f11056cbac..2f00733633 100644 --- a/routing/road_graph.hpp +++ b/routing/road_graph.hpp @@ -39,7 +39,7 @@ private: inline Junction MakeJunctionForTesting(m2::PointD const & point) { - return Junction(point, feature::kInvalidAltitude); + return Junction(point, feature::kDefautlAltitudeMeters); } inline bool AlmostEqualAbs(Junction const & lhs, Junction const & rhs) |