diff options
| author | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
|---|---|---|
| committer | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
| commit | 9e8dc9a9e3e86adb9987ae69766cc42c7d9efece (patch) | |
| tree | f5f0abd4d342c89ad0405d01969f9d6caecc1c90 /platform/darwin/src/MGLStyle.mm | |
| parent | 16fb0672e64a72b7400c321d55858b73cd5d8c3f (diff) | |
| parent | f28d75dccd9bf4a7615df87faccc5cf5eff8df89 (diff) | |
| download | qtlocation-mapboxgl-9e8dc9a9e3e86adb9987ae69766cc42c7d9efece.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/custom-vector-source
Diffstat (limited to 'platform/darwin/src/MGLStyle.mm')
| -rw-r--r-- | platform/darwin/src/MGLStyle.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm index 78c719050c..bcb8100800 100644 --- a/platform/darwin/src/MGLStyle.mm +++ b/platform/darwin/src/MGLStyle.mm @@ -217,7 +217,7 @@ static NSURL *MGLStyleURL_emerald; if (![source isKindOfClass:[MGLTileSource class]]) { continue; } - + NSArray *tileSetInfos = [source attributionInfosWithFontSize:fontSize linkColor:linkColor]; [infos growArrayByAddingAttributionInfosFromArray:tileSetInfos]; } @@ -321,7 +321,7 @@ static NSURL *MGLStyleURL_emerald; - (MGLStyleLayer *)layerFromMBGLLayer:(mbgl::style::Layer *)mbglLayer { NSParameterAssert(mbglLayer); - + NSString *identifier = @(mbglLayer->getID().c_str()); MGLStyleLayer *styleLayer; if (auto fillLayer = mbglLayer->as<mbgl::style::FillLayer>()) { @@ -438,7 +438,7 @@ static NSURL *MGLStyleURL_emerald; @"Make sure sibling was obtained using -[MGLStyle layerWithIdentifier:].", sibling]; } - + auto layers = self.mapView.mbglMap->getLayers(); std::string siblingIdentifier = sibling.identifier.UTF8String; NSUInteger index = 0; @@ -448,7 +448,7 @@ static NSURL *MGLStyleURL_emerald; } index++; } - + [self willChangeValueForKey:@"layers"]; if (index + 1 > layers.size()) { [NSException raise:NSInvalidArgumentException |