From da11771c3ab90381c1c6a7a61aefc9aa92244837 Mon Sep 17 00:00:00 2001
From: Lev Dragunov <l.dragunov@corp.mail.ru>
Date: Thu, 2 Apr 2015 18:12:23 +0300
Subject: [PATCH] Old/new mwm cross mwm fix

---
 routing/osrm_router.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp
index 139575c20b..7ed0ffe40d 100644
--- a/routing/osrm_router.cpp
+++ b/routing/osrm_router.cpp
@@ -698,9 +698,13 @@ public:
     }
   }
 
-  bool IsValid()
+  OsrmRouter::ResultCode GetError() const
   {
-    return (!m_weights.empty());
+    if (m_sources.empty())
+      return OsrmRouter::RouteFileNotExist;
+    if (m_weights.empty())
+      return OsrmRouter::EndPointNotFound;
+    return OsrmRouter::NoError;
   }
 
   bool MakeLastCrossSegment(size_t const incomeNodeId, OsrmRouter::RoutePathCross & outCrossTask)
@@ -866,6 +870,12 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
     auto const mwmOutsIter = startMapping->m_crossContext.GetOutgoingIterators();
     MultiroutingTaskPointT sources(1), targets(distance(mwmOutsIter.first, mwmOutsIter.second));
 
+    if (targets.empty())
+    {
+      route.AddAbsentCountry(startMapping->GetName());
+      return RouteFileNotExist;
+    }
+
     size_t index = 0;
     for (auto j = mwmOutsIter.first; j < mwmOutsIter.second; ++j, ++index)
       OsrmRouter::GenerateRoutingTaskFromNodeId(j->m_nodeId, false /*isStartNode*/, targets[index]);
@@ -889,8 +899,13 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
     // Load target data
     LastCrossFinder targetFinder(targetMapping, m_CachedTargetTask);
 
-    if(!targetFinder.IsValid())
-      return EndPointNotFound;
+    ResultCode const targetResult = targetFinder.GetError();
+    if (targetResult != NoError)
+    {
+      if (targetResult == RouteFileNotExist)
+        route.AddAbsentCountry(targetMapping->GetName());
+      return targetResult;
+    }
 
     EdgeWeight finalWeight = INVALID_EDGE_WEIGHT;
     CheckedPathT finalPath;