summaryrefslogtreecommitdiff
path: root/ios
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2015-10-23 10:31:27 +1100
committerLeith Bade <leith@mapbox.com>2015-10-23 14:09:24 +1100
commitf71d61fa912f27fa3ccbbdc42f4925f3f94ff01a (patch)
treee9f0e5491b5e7124dfc6a4cbdb09c71875cb32d3 /ios
parent1f4144c65a2ff63182f04e34bfa2172cd8091aeb (diff)
downloadqtlocation-mapboxgl-f71d61fa912f27fa3ccbbdc42f4925f3f94ff01a.tar.gz
[android] Add missing satellite streets style to Android and iOS.
As well as default_styles.cpp Fixes #2739 Fixes #2740
Diffstat (limited to 'ios')
-rw-r--r--ios/app/MBXViewController.mm9
1 files changed, 5 insertions, 4 deletions
diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm
index 302efbe9fc..c8ebede43c 100644
--- a/ios/app/MBXViewController.mm
+++ b/ios/app/MBXViewController.mm
@@ -12,6 +12,7 @@ static NSArray *const kStyleNames = @[
@"Light",
@"Dark",
@"Satellite",
+ @"Satellite-Hybrid",
];
static NSUInteger const kStyleVersion = 8;
@@ -445,16 +446,16 @@ static NSUInteger const kStyleVersion = 8;
{
UIImage *newButtonImage;
NSString *newButtonTitle;
-
+
switch (mode) {
case MGLUserTrackingModeNone:
newButtonImage = [UIImage imageNamed:@"TrackingLocationOffMask.png"];
break;
-
+
case MGLUserTrackingModeFollow:
newButtonImage = [UIImage imageNamed:@"TrackingLocationMask.png"];
break;
-
+
case MGLUserTrackingModeFollowWithHeading:
newButtonImage = [UIImage imageNamed:@"TrackingHeadingMask.png"];
break;
@@ -463,7 +464,7 @@ static NSUInteger const kStyleVersion = 8;
newButtonTitle = @"Course";
break;
}
-
+
self.navigationItem.rightBarButtonItem.title = newButtonTitle;
[UIView animateWithDuration:0.25 animations:^{
self.navigationItem.rightBarButtonItem.image = newButtonImage;