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

[MAPSME-5102] [ios] Workaround for IsOnRoute state.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-08-21 13:19:18 +03:00 • committed by Vladimir Byko-Ianko
parent f89a5da920
commit 84e9951fe7
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,15 +47,13 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
if (point == nullptr)
return;
NSString * pointTypeStr = @"";
NSString * pointTypeStr = nil;
switch (point.type)
{
case MWMRoutePointTypeStart: pointTypeStr = kStatRoutingPointTypeStart; break;
case MWMRoutePointTypeIntermediate: pointTypeStr = kStatRoutingPointTypeIntermediate; break;
case MWMRoutePointTypeFinish: pointTypeStr = kStatRoutingPointTypeFinish; break;
}
BOOL const isOnRoute =
[MWMNavigationDashboardManager manager].state != MWMNavigationDashboardStateNavigation;
NSString * method = nil;
if ([MWMRouter router].isAPICall)
method = kStatRoutingPointMethodApi;
@ -69,7 +67,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
kStatRoutingPointValue :
(point.isMyPosition ? kStatRoutingPointValueMyPosition : kStatRoutingPointValuePoint),
kStatRoutingPointMethod : method,
kStatRoutingMode : (isOnRoute ? kStatRoutingModeOnRoute : kStatRoutingModePlanning)
kStatRoutingMode : ([MWMRouter isOnRoute] ? kStatRoutingModeOnRoute : kStatRoutingModePlanning)
}];
}
} // namespace
@ -150,7 +148,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
+ (BOOL)isRouteBuilt { return GetFramework().GetRoutingManager().IsRouteBuilt(); }
+ (BOOL)isRouteFinished { return GetFramework().GetRoutingManager().IsRouteFinished(); }
+ (BOOL)isRouteRebuildingOnly { return GetFramework().GetRoutingManager().IsRouteRebuildingOnly(); }
+ (BOOL)isOnRoute { return GetFramework().GetRoutingManager().IsOnRoute(); }
+ (BOOL)isOnRoute { return GetFramework().GetRoutingManager().IsRoutingFollowing(); }
+ (NSArray<MWMRoutePoint *> *)points
{
NSMutableArray<MWMRoutePoint *> * points = [@[] mutableCopy];
@ -559,11 +557,10 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
- (void)onLocationUpdate:(location::GpsInfo const &)info
{
auto const & routingManager = GetFramework().GetRoutingManager();
if (!routingManager.IsRoutingActive())
if (![MWMRouter isRoutingActive])
return;
auto tts = [MWMTextToSpeech tts];
if (routingManager.IsOnRoute() && tts.active)
if ([MWMRouter isOnRoute] && tts.active)
[tts playTurnNotifications];
[self updateFollowingInfo];