tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Override file name for Mapbox Streets style JSON"

Browse Source 
Mapbox Streets has stock naming again; reverting. Easier
to ensure we name properly than build in logic.

This reverts commit 0b35a88708.
This commit is contained in:
Justin R. Miller
2015-04-10 16:34:42 -07:00
parent 53af2bda3f
commit 18ef67b002
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ios/app/MBXViewController.mm
View File

@@ -21,10 +21,6 @@ static NSArray *const kStyleNames = @[
@"Satellite",
];
static NSDictionary *const kStyleFileNames = @{
@"Mapbox Streets": @"mapbox-streets",
};
static NSString *const kStyleVersion = @"7";
@interface MBXViewController () <UIActionSheetDelegate, MGLMapViewDelegate>
@@ -251,16 +247,11 @@ 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/%@.json", styleFileName]];
[NSString stringWithFormat:@"asset://styles/%@-v%@.json",
[[styleName lowercaseString] stringByReplacingOccurrencesOfString:@" " withString:@"-"],
kStyleVersion]];
[titleButton setTitle:styleName forState:UIControlStateNormal];
}