[routing] Fixed duplicate names in absent list.

2 files changed, 12 insertions, 12 deletions

diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 7010a9763e..6c83818ad0 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -290,7 +290,7 @@ RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate)
   m_routingSession.SetRoutingCallbacks(
       [this](Route const & route, RouterResultCode code) { OnBuildRouteReady(route, code); },
       [this](Route const & route, RouterResultCode code) { OnRebuildRouteReady(route, code); },
-      [this](uint64_t routeId, vector<string> const & absentCountries) {
+      [this](uint64_t routeId, storage::CountriesSet const & absentCountries) {
         OnNeedMoreMaps(routeId, absentCountries);
       },
       [this](RouterResultCode code) { OnRemoveRoute(code); });
@@ -379,7 +379,7 @@ void RoutingManager::OnBuildRouteReady(Route const & route, RouterResultCode cod
                            true /* useVisibleViewport */);
   }
 
-  CallRouteBuilded(hasWarnings ? RouterResultCode::HasWarnings : code, storage::CountriesVec());
+  CallRouteBuilded(hasWarnings ? RouterResultCode::HasWarnings : code, storage::CountriesSet());
 }
 
 void RoutingManager::OnRebuildRouteReady(Route const & route, RouterResultCode code)
@@ -390,10 +390,10 @@ void RoutingManager::OnRebuildRouteReady(Route const & route, RouterResultCode c
     return;
 
   auto const hasWarnings = InsertRoute(route);
-  CallRouteBuilded(hasWarnings ? RouterResultCode::HasWarnings : code, storage::CountriesVec());
+  CallRouteBuilded(hasWarnings ? RouterResultCode::HasWarnings : code, storage::CountriesSet());
 }
 
-void RoutingManager::OnNeedMoreMaps(uint64_t routeId, vector<string> const & absentCountries)
+void RoutingManager::OnNeedMoreMaps(uint64_t routeId, storage::CountriesSet const & absentCountries)
 {
   // No need to inform user about maps needed for the route if the method is called
   // when RoutingSession contains a new route.
@@ -408,7 +408,7 @@ void RoutingManager::OnRemoveRoute(routing::RouterResultCode code)
 {
   HidePreviewSegments();
   RemoveRoute(true /* deactivateFollowing */);
-  CallRouteBuilded(code, vector<string>());
+  CallRouteBuilded(code, storage::CountriesSet());
 }
 
 void RoutingManager::OnRoutePointPassed(RouteMarkType type, size_t intermediateIndex)
@@ -936,7 +936,7 @@ void RoutingManager::BuildRoute(uint32_t timeoutSec)
   auto routePoints = GetRoutePoints();
   if (routePoints.size() < 2)
   {
-    CallRouteBuilded(RouterResultCode::Cancelled, storage::CountriesVec());
+    CallRouteBuilded(RouterResultCode::Cancelled, storage::CountriesSet());
     CloseRouting(false /* remove route points */);
     return;
   }
@@ -950,7 +950,7 @@ void RoutingManager::BuildRoute(uint32_t timeoutSec)
     auto const & myPosition = m_bmManager->MyPositionMark();
     if (!myPosition.HasPosition())
     {
-      CallRouteBuilded(RouterResultCode::NoCurrentPosition, storage::CountriesVec());
+      CallRouteBuilded(RouterResultCode::NoCurrentPosition, storage::CountriesSet());
       return;
     }
     p.m_position = myPosition.GetPivot();
@@ -964,7 +964,7 @@ void RoutingManager::BuildRoute(uint32_t timeoutSec)
     {
       if (routePoints[i].m_position.EqualDxDy(routePoints[j].m_position, kEps))
       {
-        CallRouteBuilded(RouterResultCode::Cancelled, storage::CountriesVec());
+        CallRouteBuilded(RouterResultCode::Cancelled, storage::CountriesSet());
         CloseRouting(false /* remove route points */);
         return;
       }
@@ -1067,7 +1067,7 @@ void RoutingManager::CheckLocationForRouting(location::GpsInfo const & info)
 }
 
 void RoutingManager::CallRouteBuilded(RouterResultCode code,
-                                      storage::CountriesVec const & absentCountries)
+                                      storage::CountriesSet const & absentCountries)
 {
   m_routingBuildingCallback(code, absentCountries);
 }
diff --git a/map/routing_manager.hpp b/map/routing_manager.hpp
index ec5dd914f2..8182d98022 100644
--- a/map/routing_manager.hpp
+++ b/map/routing_manager.hpp
@@ -101,7 +101,7 @@ public:
   };
 
   using RouteBuildingCallback =
-      std::function<void(routing::RouterResultCode, storage::CountriesVec const &)>;
+      std::function<void(routing::RouterResultCode, storage::CountriesSet const &)>;
 
   using RouteStartBuildCallback = std::function<void(std::vector<RouteMarkData> const & points)>;
 
@@ -219,10 +219,10 @@ public:
 
   void CheckLocationForRouting(location::GpsInfo const & info);
   void CallRouteBuilded(routing::RouterResultCode code,
-                        storage::CountriesVec const & absentCountries);
+                        storage::CountriesSet const & absentCountries);
   void OnBuildRouteReady(routing::Route const & route, routing::RouterResultCode code);
   void OnRebuildRouteReady(routing::Route const & route, routing::RouterResultCode code);
-  void OnNeedMoreMaps(uint64_t routeId, std::vector<std::string> const & absentCountries);
+  void OnNeedMoreMaps(uint64_t routeId, storage::CountriesSet const & absentCountries);
   void OnRemoveRoute(routing::RouterResultCode code);
   void OnRoutePointPassed(RouteMarkType type, size_t intermediateIndex);
   void OnLocationUpdate(location::GpsInfo const & info);