From 3a1e44f4d5b06e262bffe5ef5d670b6c45443fb3 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Wed, 1 Mar 2017 13:37:33 +0300
Subject: [PATCH 1/2] routing integration test fix.

---
 .../routing_test_tools.cpp                          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/routing/routing_integration_tests/routing_test_tools.cpp
index c5ead5768d..52c8495604 100644
--- a/routing/routing_integration_tests/routing_test_tools.cpp
+++ b/routing/routing_integration_tests/routing_test_tools.cpp
@@ -79,14 +79,20 @@ namespace integration
 
   unique_ptr<CarRouter> CreateCarRouter(Index & index,
                                         storage::CountryInfoGetter const & infoGetter,
-                                        traffic::TrafficCache const & trafficCache)
+                                        traffic::TrafficCache const & trafficCache,
+                                        vector<LocalCountryFile> const & localFiles)
   {
     auto const countryFileGetter = [&infoGetter](m2::PointD const & pt) {
       return infoGetter.GetRegionCountryId(pt);
     };
 
+    shared_ptr<NumMwmIds> numMwmIds = make_shared<NumMwmIds>();
+    for (LocalCountryFile const & f : localFiles)
+      numMwmIds->RegisterFile(f.GetCountryFile());
+
     auto carRouter = make_unique<CarRouter>(index, countryFileGetter,
-                                            SingleMwmRouter::CreateCarRouter(countryFileGetter, nullptr, trafficCache, index));
+                                            SingleMwmRouter::CreateCarRouter(countryFileGetter, numMwmIds,
+                                                                             trafficCache, index));
     return carRouter;
   }
 
@@ -109,7 +115,8 @@ namespace integration
   public:
     OsrmRouterComponents(vector<LocalCountryFile> const & localFiles)
       : IRouterComponents(localFiles)
-      , m_carRouter(CreateCarRouter(m_featuresFetcher->GetIndex(), *m_infoGetter, m_trafficCache))
+      , m_carRouter(CreateCarRouter(m_featuresFetcher->GetIndex(), *m_infoGetter, m_trafficCache,
+                                    localFiles))
     {
     }
 

From 2eb7b094f89c21aef38ca32e961bdc26f7e44ba6 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Wed, 1 Mar 2017 13:50:39 +0300
Subject: [PATCH 2/2] Review fixes.

---
 routing/single_mwm_router.cpp | 1 +
 routing/single_mwm_router.hpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/routing/single_mwm_router.cpp b/routing/single_mwm_router.cpp
index 5a07586cb4..afcab0dd2e 100644
--- a/routing/single_mwm_router.cpp
+++ b/routing/single_mwm_router.cpp
@@ -297,6 +297,7 @@ unique_ptr<SingleMwmRouter> SingleMwmRouter::CreateCarRouter(
     TCountryFileFn const & countryFileFn, shared_ptr<NumMwmIds> numMwmIds,
     traffic::TrafficCache const & trafficCache, Index & index)
 {
+  CHECK(numMwmIds, ());
   auto vehicleModelFactory = make_shared<CarModelFactory>();
   // @TODO Bicycle turn generation engine is used now. It's ok for the time being.
   // But later a special car turn generation engine should be implemented.
diff --git a/routing/single_mwm_router.hpp b/routing/single_mwm_router.hpp
index 9524352a6c..e815d4e0bc 100644
--- a/routing/single_mwm_router.hpp
+++ b/routing/single_mwm_router.hpp
@@ -40,6 +40,8 @@ public:
                                              Route & route) override;
 
   void SetCountry(string const & country) { m_country = country; }
+
+  /// \note |numMwmIds| should not be null.
   static unique_ptr<SingleMwmRouter> CreateCarRouter(TCountryFileFn const & countryFileFn,
                                                      shared_ptr<NumMwmIds> numMwmIds,
                                                      traffic::TrafficCache const & trafficCache,