Add support for reroutes, disable simulator checksupstream/bs-telem-api

2 files changed, 11 insertions, 7 deletions

diff --git a/platform/ios/src/MGLMapboxEvents.h b/platform/ios/src/MGLMapboxEvents.h
index dfa36b4ddc..688f46ef2e 100644
--- a/platform/ios/src/MGLMapboxEvents.h
+++ b/platform/ios/src/MGLMapboxEvents.h
@@ -14,6 +14,7 @@ extern NSString *const MGLEventTypeNavigationTurnstile;
 extern NSString *const MGLEventTypeNavigationDepart;
 extern NSString *const MGLEventTypeNavigationArrive;
 extern NSString *const MGLEventTypeNavigationCancel;
+extern NSString *const MGLEventTypeNavigationReroute;
 extern NSString *const MGLEventTypeNavigationFeedback;
 
 // Event keys
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;