From 8cfa34181e8117162587b7a56e178511c62a379e Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Fri, 9 Jun 2017 14:39:38 +0300
Subject: [PATCH] Correct UniNodeId in mwm case.

---
 routing/bicycle_directions.cpp | 6 +++++-
 routing/turns.cpp              | 6 ++++++
 routing/turns.hpp              | 6 +++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp
index 7df13d9808..0807b805ea 100644
--- a/routing/bicycle_directions.cpp
+++ b/routing/bicycle_directions.cpp
@@ -212,6 +212,9 @@ void BicycleDirectionsEngine::Generate(RoadGraphBase const & graph, vector<Junct
   MakeTurnAnnotation(resultGraph, delegate, routeGeometry, turns, dummyTimes, streetNames,
                      trafficSegs);
   CHECK_EQUAL(routeGeometry.size(), pathSize, ());
+  // In case of bicycle routing |m_pathSegments| may have an empty
+  // |LoadedPathSegment::m_trafficSegs| fields. In that case |trafficSegs| is empty
+  // so size of |trafficSegs| is not equal to size of |routeEdges|.
   if (!trafficSegs.empty())
     CHECK_EQUAL(trafficSegs.size(), routeEdges.size(), ());
 }
@@ -252,6 +255,7 @@ void BicycleDirectionsEngine::GetUniNodeIdAndAdjacentEdges(IRoadGraph::TEdgeVect
   outgoingTurns.isCandidatesAngleValid = true;
   outgoingTurns.candidates.reserve(outgoingEdges.size());
   uniNodeId = UniNodeId(inEdge.GetFeatureId(), startSegId, endSegId, inEdge.IsForward());
+  CHECK(uniNodeId.IsCorrect(), ());
   m2::PointD const & ingoingPoint = inEdge.GetStartJunction().GetPoint();
   m2::PointD const & junctionPoint = inEdge.GetEndJunction().GetPoint();
 
@@ -364,7 +368,7 @@ void BicycleDirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(
 
     AdjacentEdges adjacentEdges(ingoingEdges.size());
     UniNodeId uniNodeId(UniNodeId::Type::Mwm);
-    GetUniNodeIdAndAdjacentEdges(outgoingEdges, inEdge, startSegId, inSegId + 1, uniNodeId,
+    GetUniNodeIdAndAdjacentEdges(outgoingEdges, inEdge, startSegId, inSegId, uniNodeId,
                                  adjacentEdges.m_outgoingTurns);
 
     size_t const prevJunctionSize = prevJunctions.size();
diff --git a/routing/turns.cpp b/routing/turns.cpp
index b536df27a7..e77c4dd65b 100644
--- a/routing/turns.cpp
+++ b/routing/turns.cpp
@@ -129,6 +129,12 @@ FeatureID const & UniNodeId::GetFeature() const
   return m_featureId;
 }
 
+bool UniNodeId::IsCorrect() const
+{
+  return m_type == Type::Mwm &&
+         (m_forward && m_startSegId <= m_endSegId || !m_forward && m_endSegId <= m_startSegId);
+}
+
 string DebugPrint(UniNodeId::Type type)
 {
   switch (type)
diff --git a/routing/turns.hpp b/routing/turns.hpp
index f169eaf7db..fa72589c96 100644
--- a/routing/turns.hpp
+++ b/routing/turns.hpp
@@ -37,14 +37,18 @@ struct UniNodeId
   void Clear();
   uint32_t GetNodeId() const;
   FeatureID const & GetFeature() const;
+  // \returns true if the instance of UniNodeId is correct.
+  bool IsCorrect() const;
 
 private:
   static std::atomic<NodeID> m_nextFakeId;
 
   Type m_type;
   FeatureID m_featureId;     // Not valid for OSRM.
+  // Note. In mwm case if UniNodeId represents two directional feature |m_endSegId| is greater
+  // than |m_startSegId| if |m_forward| == true.
   uint32_t m_startSegId = 0; // Not valid for OSRM. The first segment index of UniNodeId.
-  uint32_t m_endSegId = 0;   // Not valid for OSRM. The segment index after last of UniNodeId.
+  uint32_t m_endSegId = 0;   // Not valid for OSRM. The last segment index UniNodeId.
   bool m_forward = true;     // Not valid for OSRM. Segment direction in |m_featureId|.
   // Node id for OSRM case. Fake feature id if UniNodeId is based on an invalid feature id valid for
   // mwm case. UniNodeId is based on an invalid feature id in case of fake edges near starts and