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

Avoid building a redundant array

Browse Source 
Followup to 28e28934c7.
This commit is contained in:
Minh Nguyễn
2015-03-12 09:25:39 -07:00
parent 28e28934c7
commit 4c7939b96e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/ios/MGLMapView.mm
View File

@@ -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];