From dfeb479011bbbd99de37863f5bea5fc1a8b0e02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Thu, 13 Aug 2015 10:00:05 -0700 Subject: MGLUserTrackingModeFollowWithCourse Added course-tracking. However, rotation has to happen atomically without animation until #1834 is fixed. Fixes #1605. --- ios/app/MBXViewController.mm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'ios') diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm index e11f7eea5c..037a6a02ca 100644 --- a/ios/app/MBXViewController.mm +++ b/ios/app/MBXViewController.mm @@ -310,18 +310,20 @@ mbgl::Settings_NSUserDefaults *settings = nullptr; - (void)locateUser { - if (self.mapView.userTrackingMode == MGLUserTrackingModeNone) - { - self.mapView.userTrackingMode = MGLUserTrackingModeFollow; - } - else if (self.mapView.userTrackingMode == MGLUserTrackingModeFollow) - { - self.mapView.userTrackingMode = MGLUserTrackingModeFollowWithHeading; - } - else - { - self.mapView.userTrackingMode = MGLUserTrackingModeNone; + MGLUserTrackingMode nextMode; + switch (self.mapView.userTrackingMode) { + case MGLUserTrackingModeNone: + nextMode = MGLUserTrackingModeFollow; + break; + case MGLUserTrackingModeFollow: + nextMode = MGLUserTrackingModeFollowWithHeading; + break; + case MGLUserTrackingModeFollowWithHeading: + case MGLUserTrackingModeFollowWithCourse: + nextMode = MGLUserTrackingModeNone; + break; } + self.mapView.userTrackingMode = nextMode; } #pragma mark - Destruction @@ -413,6 +415,7 @@ mbgl::Settings_NSUserDefaults *settings = nullptr; break; case MGLUserTrackingModeFollowWithHeading: + case MGLUserTrackingModeFollowWithCourse: newButtonImage = [UIImage imageNamed:@"TrackingHeadingMask.png"]; break; } -- cgit v1.2.1