pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[routing] xcode build fix.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-09-26 09:03:46 +03:00 • committed by Tatiana Yan
parent 43661f2d48
commit 9dc57182c8
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h
View file

@ -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

3
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
View file

@ -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])
{

4
iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm
View file

@ -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];

4
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -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())