diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/ios/MGLMapView.mm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 76415432ea..d9390ef178 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -947,18 +947,17 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; _bundledStyleNames = [NSMutableArray array]; NSArray *bundledStyleNamesWithExtensions = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:stylesPath error:nil]; - // Add satellite raster & "hybrid" (satellite raster + vector contours & labels) NSString *hybridStylePrefix = @"hybrid-"; NSString *satelliteStylePrefix = @"satellite-"; - NSMutableArray *hybridStyleNames = [NSMutableArray array]; - for (NSString *styleName in bundledStyleNamesWithExtensions) { - [_bundledStyleNames addObject:[styleName stringByDeletingPathExtension]]; + for (NSString *fileName in bundledStyleNamesWithExtensions) { + NSString *styleName = [fileName stringByDeletingPathExtension]; + [_bundledStyleNames addObject:styleName]; + // Add satellite raster & "hybrid" (satellite raster + vector contours & labels) if ([styleName hasPrefix:satelliteStylePrefix]) { - [hybridStyleNames addObject:[hybridStylePrefix stringByAppendingString:[[styleName substringFromIndex:[satelliteStylePrefix length]] stringByDeletingPathExtension]]]; + [_bundledStyleNames addObject:[hybridStylePrefix stringByAppendingString:[styleName substringFromIndex:[satelliteStylePrefix length]]]]; } } - [_bundledStyleNames addObjectsFromArray:hybridStyleNames]; } return [NSArray arrayWithArray:_bundledStyleNames]; |