summaryrefslogtreecommitdiff
path: root/ios
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-08-24 11:34:03 -0700
committerJustin R. Miller <incanus@codesorcery.net>2015-08-24 11:34:03 -0700
commit92dd26c8be78b30429e4d38bad3b67b32046ed06 (patch)
tree4d4cce2b7de8b58d217767239a06923457f100b1 /ios
parent0451aca37e866c3380072b114e2d49353888e4b5 (diff)
downloadqtlocation-mapboxgl-92dd26c8be78b30429e4d38bad3b67b32046ed06.tar.gz
iOS app/framework fixes for v8
- Mapbox Streets -> Streets - style version from string to integer - 7 -> 8
Diffstat (limited to 'ios')
-rw-r--r--ios/app/MBXViewController.mm10
1 files changed, 5 insertions, 5 deletions
diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm
index f5ec262bf4..cf7df0fc3a 100644
--- a/ios/app/MBXViewController.mm
+++ b/ios/app/MBXViewController.mm
@@ -9,7 +9,7 @@
static UIColor *const kTintColor = [UIColor colorWithRed:0.120 green:0.550 blue:0.670 alpha:1.000];
static NSArray *const kStyleNames = @[
- @"Mapbox Streets",
+ @"Streets",
@"Emerald",
@"Light",
@"Dark",
@@ -19,7 +19,7 @@ static NSArray *const kStyleNames = @[
@"Satellite",
];
-static NSString *const kStyleVersion = @"7";
+static NSUInteger const kStyleVersion = 8;
@interface MBXViewController () <UIActionSheetDelegate, MGLMapViewDelegate>
@@ -301,9 +301,9 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
}
self.mapView.styleURL = [NSURL URLWithString:
- [NSString stringWithFormat:@"asset://styles/%@-v%@.json",
- [[styleName lowercaseString] stringByReplacingOccurrencesOfString:@" " withString:@"-"],
- kStyleVersion]];
+ [NSString stringWithFormat:@"asset://styles/%@-v%lu.json",
+ [styleName lowercaseString],
+ (unsigned long)kStyleVersion]];
[titleButton setTitle:styleName forState:UIControlStateNormal];
}