Updated the carplay event constants to match up with the expected eve…

…nts schema at the server side. (#77)
mapbox · Oct 9, 2018 · ffc5c61 · ffc5c61
1 parent 3fbaff0
commit ffc5c61
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 36 deletions.
diff --git a/MapboxMobileEvents/MMEConstants.h b/MapboxMobileEvents/MMEConstants.h
@@ -81,13 +81,12 @@ extern NSString * const MMEEventTypeNavigationArrive;
 extern NSString * const MMEEventTypeNavigationCancel;
 extern NSString * const MMEEventTypeNavigationFeedback;
 extern NSString * const MMEEventTypeNavigationReroute;
+extern NSString * const MMEventTypeNavigationCarplayConnect;
+extern NSString * const MMEventTypeNavigationCarplayDisconnect;
 extern NSString * const MMEDebugEventType;
 extern NSString * const MMEEventTypeSearchSelected;
 extern NSString * const MMEEventTypeSearchFeedback;
 extern NSString * const MMESearchEventPrefix;
-extern NSString * const MMEventTypeCarplayConnect;
-extern NSString * const MMEventTypeCarplayDisconnect;
-extern NSString * const MMEventCarplayPrefix;
 
 // SDK event source
 extern NSString * const MMEEventSource;

diff --git a/MapboxMobileEvents/MMEConstants.m b/MapboxMobileEvents/MMEConstants.m
@@ -79,13 +79,12 @@
 NSString * const MMEEventTypeNavigationCancel = @"navigation.cancel";
 NSString * const MMEEventTypeNavigationFeedback = @"navigation.feedback";
 NSString * const MMEEventTypeNavigationReroute = @"navigation.reroute";
+NSString * const MMEventTypeNavigationCarplayConnect = @"navigation.carplay.connect";
+NSString * const MMEventTypeNavigationCarplayDisconnect = @"navigation.carplay.disconnect";
 NSString * const MMEDebugEventType = @"debug.type";
 NSString * const MMESearchEventPrefix = @"search.";
 NSString * const MMEEventTypeSearchSelected = @"search.selected";
 NSString * const MMEEventTypeSearchFeedback = @"search.feedback";
-NSString * const MMEventTypeCarplayConnect = @"carplay.connect";
-NSString * const MMEventTypeCarplayDisconnect = @"carplay.disconnect";
-NSString * const MMEventCarplayPrefix = @"carplay.";
 
 NSString * const MMEEventSource = @"mapbox";
 

diff --git a/MapboxMobileEvents/MMEEventsManager.m b/MapboxMobileEvents/MMEEventsManager.m
@@ -340,10 +340,6 @@ - (void)createAndPushEventBasedOnName:(NSString *)name attributes:(NSDictionary
     if ([name hasPrefix:MMESearchEventPrefix]) {
         event = [MMEEvent searchEventWithName:name attributes:attributes];
     }
-
-    if ([name hasPrefix:MMEventCarplayPrefix]) {
-        event = [MMEEvent carplayEventWithName:name attributes:attributes];
-    }
 
     if (event) {
         [self pushDebugEventWithAttributes:@{MMEDebugEventType: MMEDebugEventTypePush,

diff --git a/MapboxMobileEvents/MMENamespacedDependencies.h b/MapboxMobileEvents/MMENamespacedDependencies.h
@@ -425,6 +425,10 @@
 #define MMEEventTypeLocalDebug __NS_SYMBOL(MMEEventTypeLocalDebug)
 #endif
 
+#ifndef MMEEventTypeOfflineDownload
+#define MMEEventTypeOfflineDownload __NS_SYMBOL(MMEEventTypeOfflineDownload)
+#endif
+
 #ifndef MMEEventGestureSingleTap
 #define MMEEventGestureSingleTap __NS_SYMBOL(MMEEventGestureSingleTap)
 #endif
@@ -597,6 +601,14 @@
 #define MMEEventTypeNavigationReroute __NS_SYMBOL(MMEEventTypeNavigationReroute)
 #endif
 
+#ifndef MMEventTypeNavigationCarplayConnect
+#define MMEventTypeNavigationCarplayConnect __NS_SYMBOL(MMEventTypeNavigationCarplayConnect)
+#endif
+
+#ifndef MMEventTypeNavigationCarplayDisconnect
+#define MMEventTypeNavigationCarplayDisconnect __NS_SYMBOL(MMEventTypeNavigationCarplayDisconnect)
+#endif
+
 #ifndef MMEDebugEventType
 #define MMEDebugEventType __NS_SYMBOL(MMEDebugEventType)
 #endif
@@ -613,18 +625,6 @@
 #define MMEEventTypeSearchFeedback __NS_SYMBOL(MMEEventTypeSearchFeedback)
 #endif
 
-#ifndef MMEventTypeCarplayConnect
-#define MMEventTypeCarplayConnect __NS_SYMBOL(MMEventTypeCarplayConnect)
-#endif
-
-#ifndef MMEventTypeCarplayDisconnect
-#define MMEventTypeCarplayDisconnect __NS_SYMBOL(MMEventTypeCarplayDisconnect)
-#endif
-
-#ifndef MMEventCarplayPrefix
-#define MMEventCarplayPrefix __NS_SYMBOL(MMEventCarplayPrefix)
-#endif
-
 #ifndef MMEEventSource
 #define MMEEventSource __NS_SYMBOL(MMEEventSource)
 #endif

diff --git a/MapboxMobileEventsTests/MMEEventsManagerTests.mm b/MapboxMobileEventsTests/MMEEventsManagerTests.mm
@@ -829,20 +829,6 @@ @interface MMEEventsManager (Tests) <MMELocationManagerDelegate>
                 });
             });
 
-            context(@"when a carplay event is pushed", ^{
-                __block NSString * carplayEventName = @"carplay.*";
-
-                beforeEach(^{
-                    [eventsManager enqueueEventWithName:carplayEventName attributes:attributes];
-                });
-
-                it(@"has the correct event", ^{
-                    MMEEvent *expectedEvent = [MMEEvent carplayEventWithName:carplayEventName attributes:attributes];
-                    MMEEvent *event = eventsManager.eventQueue.firstObject;
-                    event should equal(expectedEvent);
-                });
-            });
-
             context(@"when an unknown event is pushed", ^{
                 beforeEach(^{
                     [eventsManager enqueueEventWithName:@"invalid" attributes:attributes];