diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h index 96aafc0a1e..154a1c98c3 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h @@ -1,6 +1,6 @@ #import "MWMNavigationDashboardManager.h" -namespace location +namespace routing { class FollowingInfo; } @@ -9,7 +9,7 @@ struct TransitRouteInfo; @interface MWMNavigationDashboardManager (Entity) -- (void)updateFollowingInfo:(location::FollowingInfo const &)info; +- (void)updateFollowingInfo:(routing::FollowingInfo const &)info; - (void)updateTransitInfo:(TransitRouteInfo const &)info; @end diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm index 67642846c7..b1f633b001 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm @@ -5,6 +5,7 @@ #import "MWMRouterTransitStepInfo.h" #import "SwiftBridge.h" +#include "routing/following_info.hpp" #include "routing/turns.hpp" #include "map/routing_manager.hpp" @@ -121,7 +122,7 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS @implementation MWMNavigationDashboardManager (Entity) -- (void)updateFollowingInfo:(location::FollowingInfo const &)info +- (void)updateFollowingInfo:(routing::FollowingInfo const &)info { if ([MWMRouter isRouteFinished]) { diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm index f8d2c170c7..dc5c6e5913 100644 --- a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm +++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm @@ -9,6 +9,8 @@ #import "SwiftBridge.h" #include "Framework.h" + +#include "routing/following_info.hpp" #include "routing/turns.hpp" #include "routing/routing_session.hpp" @@ -80,7 +82,7 @@ - (MWMRouteInfo *)routeInfo { if (!self.isRoutingActive) { return nil; } - location::FollowingInfo info; + routing::FollowingInfo info; self.rm.GetRouteFollowingInfo(info); if (!info.IsValid()) { return nil; } CLLocation * lastLocation = [MWMLocationManager lastLocation]; diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index 16c5574fea..5d5048aa98 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -19,6 +19,8 @@ #include "Framework.h" +#include "routing/following_info.hpp" + #include "indexer/feature_altitude.hpp" #include "platform/local_country_file_utils.hpp" @@ -540,7 +542,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType) if (![MWMRouter isRoutingActive]) return; auto const & rm = GetFramework().GetRoutingManager(); - location::FollowingInfo info; + routing::FollowingInfo info; rm.GetRouteFollowingInfo(info); auto navManager = [MWMNavigationDashboardManager manager]; if (!info.IsValid())