Merge pull request #1236 from mapbox/1ec5-streets

Override file name for Mapbox Streets style JSON
This commit is contained in:
Minh Nguyễn
2015-04-08 18:03:24 -07:00

View File

@@ -20,6 +20,10 @@ static NSArray *const kStyleNames = @[
@"Satellite",
];
static NSDictionary *const kStyleFileNames = @{
@"Mapbox Streets": @"mapbox-streets",
};
static NSString *const kStyleVersion = @"7";
@interface MBXViewController () <UIActionSheetDelegate, MGLMapViewDelegate>
@@ -246,11 +250,16 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
if (index == [kStyleNames count]) index = 0;
styleName = [kStyleNames objectAtIndex:index];
}
NSString *styleFileName = kStyleFileNames[styleName];
if (!styleFileName) {
styleFileName = [NSString stringWithFormat:@"%@-v%@",
[styleName.lowercaseString stringByReplacingOccurrencesOfString:@" " withString:@"-"],
kStyleVersion];
}
self.mapView.styleURL = [NSURL URLWithString:
[NSString stringWithFormat:@"asset://styles/%@-v%@.json",
[[styleName lowercaseString] stringByReplacingOccurrencesOfString:@" " withString:@"-"],
kStyleVersion]];
[NSString stringWithFormat:@"asset://styles/%@.json", styleFileName]];
[titleButton setTitle:styleName forState:UIControlStateNormal];
}