summaryrefslogtreecommitdiff
path: root/platform/ios/src/MGLMapboxEvents.m
diff options
context:
space:
mode:
Diffstat (limited to 'platform/ios/src/MGLMapboxEvents.m')
-rw-r--r--platform/ios/src/MGLMapboxEvents.m17
1 files changed, 10 insertions, 7 deletions
diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m
index cd991b4022..9a56897742 100644
--- a/platform/ios/src/MGLMapboxEvents.m
+++ b/platform/ios/src/MGLMapboxEvents.m
@@ -21,6 +21,7 @@ NSString *const MGLEventTypeNavigationTurnstile = @"navigation.turnstile";
NSString *const MGLEventTypeNavigationDepart = @"navigation.depart";
NSString *const MGLEventTypeNavigationArrive = @"navigation.arrive";
NSString *const MGLEventTypeNavigationCancel = @"navigation.cancel";
+NSString *const MGLEventTypeNavigationReroute = @"navigation.reroute";
NSString *const MGLEventTypeNavigationFeedback = @"navigation.feedback";
// Gestures
@@ -150,9 +151,9 @@ const NSTimeInterval MGLFlushInterval = 180;
}
+ (BOOL)isEnabled {
-#if TARGET_OS_SIMULATOR
- return NO;
-#else
+//#if TARGET_OS_SIMULATOR
+// return NO;
+//#else
BOOL isLowPowerModeEnabled = NO;
if ([NSProcessInfo instancesRespondToSelector:@selector(isLowPowerModeEnabled)]) {
isLowPowerModeEnabled = [[NSProcessInfo processInfo] isLowPowerModeEnabled];
@@ -160,7 +161,7 @@ const NSTimeInterval MGLFlushInterval = 180;
return ([[NSUserDefaults standardUserDefaults] boolForKey:@"MGLMapboxMetricsEnabled"] &&
[[NSUserDefaults standardUserDefaults] integerForKey:@"MGLMapboxAccountType"] == 0 &&
!isLowPowerModeEnabled);
-#endif
+//#endif
}
@@ -432,11 +433,13 @@ const NSTimeInterval MGLFlushInterval = 180;
return attributeDictionary;
} else if ([event isEqualToString:MGLEventTypeNavigationDepart]) {
return attributeDictionary;
- }else if ([event isEqualToString:MGLEventTypeNavigationArrive]) {
+ } else if ([event isEqualToString:MGLEventTypeNavigationArrive]) {
+ return attributeDictionary;
+ } else if ([event isEqualToString:MGLEventTypeNavigationCancel]) {
return attributeDictionary;
- }else if ([event isEqualToString:MGLEventTypeNavigationCancel]) {
+ } else if ([event isEqualToString:MGLEventTypeNavigationReroute]) {
return attributeDictionary;
- }else if ([event isEqualToString:MGLEventTypeNavigationFeedback]) {
+ } else if ([event isEqualToString:MGLEventTypeNavigationFeedback]) {
return attributeDictionary;
}
return nil;