Merge pull request #5468 from dobriy-eeh/cross-mwm-routingbeta-657

[routing] Enable cross mwm index router

1 files changed, 4 insertions, 3 deletions

diff --git a/routing/car_router.hpp b/routing/car_router.hpp
index 4a62046391..d32fc9252a 100644
--- a/routing/car_router.hpp
+++ b/routing/car_router.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
+#include "routing/index_router.hpp"
 #include "routing/osrm_data_facade.hpp"
 #include "routing/osrm_engine.hpp"
 #include "routing/route.hpp"
 #include "routing/router.hpp"
 #include "routing/routing_mapping.hpp"
-#include "routing/single_mwm_router.hpp"
 
 #include "std/unique_ptr.hpp"
 #include "std/vector.hpp"
@@ -35,7 +35,7 @@ public:
   typedef vector<double> GeomTurnCandidateT;
 
   CarRouter(Index & index, TCountryFileFn const & countryFileFn,
-            unique_ptr<SingleMwmRouter> localRouter);
+            unique_ptr<IndexRouter> localRouter);
 
   virtual string GetName() const override;
 
@@ -85,6 +85,7 @@ private:
   // @TODO(bykoianko) When routing section implementation is merged to master
   // this method should be moved to routing loader.
   bool DoesEdgeIndexExist(Index::MwmId const & mwmId);
+  bool AllMwmsHaveRoutingIndex() const;
 
   /*!
    * \brief Builds a route within one mwm using A* if edge index section is available and osrm
@@ -115,6 +116,6 @@ private:
 
   RoutingIndexManager m_indexManager;
 
-  unique_ptr<SingleMwmRouter> m_router;
+  unique_ptr<IndexRouter> m_router;
 };
 }  // namespace routing