Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Carplay events modified to adhere to server schema. #77

Merged
merged 1 commit into from
Oct 9, 2018
Merged

Carplay events modified to adhere to server schema. #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions MapboxMobileEvents/MMEConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions MapboxMobileEvents/MMEConstants.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 0 additions & 4 deletions MapboxMobileEvents/MMEEventsManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
24 changes: 12 additions & 12 deletions MapboxMobileEvents/MMENamespacedDependencies.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,10 @@
#define MMEEventTypeLocalDebug __NS_SYMBOL(MMEEventTypeLocalDebug)
#endif

#ifndef MMEEventTypeOfflineDownload
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this about? Is this related to CarPlay events at all?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is a separate event related to Maps SDK

#define MMEEventTypeOfflineDownload __NS_SYMBOL(MMEEventTypeOfflineDownload)
#endif

#ifndef MMEEventGestureSingleTap
#define MMEEventGestureSingleTap __NS_SYMBOL(MMEEventGestureSingleTap)
#endif
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 0 additions & 14 deletions MapboxMobileEventsTests/MMEEventsManagerTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,20 +829,6 @@ @interface MMEEventsManager (Tests) <MMELocationManagerDelegate>
});
});

context(@"when a carplay event is pushed", ^{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why delete this test? It seems it should be updated for the new event name?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's no longer needed since the prefix check for navigation already exists

__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];
Expand Down