diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2018-01-25 10:46:27 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-25 10:46:27 -0800 |
commit | b6747a84f4ba6bd48ab2d461e04cffa7fc8d5348 (patch) | |
tree | e01efa0e57e6dc5a0a55db2f68bc964cb6fb1606 /platform/darwin/src/MGLRasterSource.mm | |
parent | a4546a84de28cfddfcb1e5a4ba8b0516a4b4dfa4 (diff) | |
download | qtlocation-mapboxgl-b6747a84f4ba6bd48ab2d461e04cffa7fc8d5348.tar.gz |
[ios, macos] Hook up hillshade style layers, raster DEM sources to iOS/macOS (#11036)
* [ios, macos] Finished implementing MGLHillshadeStyleLayer
* [macos] Added icon for hillshade layer
Also set the background layer icon to mirror in right-to-left locales.
* [ios, macos] Implemented raster DEM source
* [macos] Added Enhance Terrain debugging command
* [ios, macos] Simplified raster DEM source example
Diffstat (limited to 'platform/darwin/src/MGLRasterSource.mm')
-rw-r--r-- | platform/darwin/src/MGLRasterSource.mm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/platform/darwin/src/MGLRasterSource.mm b/platform/darwin/src/MGLRasterSource.mm index 8fc18ba69d..c47cc199eb 100644 --- a/platform/darwin/src/MGLRasterSource.mm +++ b/platform/darwin/src/MGLRasterSource.mm @@ -33,12 +33,17 @@ static const CGFloat MGLRasterSourceRetinaTileSize = 512; } - (instancetype)initWithIdentifier:(NSString *)identifier configurationURL:(NSURL *)configurationURL tileSize:(CGFloat)tileSize { - auto source = std::make_unique<mbgl::style::RasterSource>(identifier.UTF8String, - configurationURL.mgl_URLByStandardizingScheme.absoluteString.UTF8String, - uint16_t(round(tileSize))); + auto source = [self pendingSourceWithIdentifier:identifier configurationURL:configurationURL tileSize:tileSize]; return self = [super initWithPendingSource:std::move(source)]; } +- (std::unique_ptr<mbgl::style::RasterSource>)pendingSourceWithIdentifier:(NSString *)identifier configurationURL:(NSURL *)configurationURL tileSize:(CGFloat)tileSize { + NSString *configurationURLString = configurationURL.mgl_URLByStandardizingScheme.absoluteString; + return std::make_unique<mbgl::style::RasterSource>(identifier.UTF8String, + configurationURLString.UTF8String, + uint16_t(round(tileSize))); +} + - (instancetype)initWithIdentifier:(NSString *)identifier tileURLTemplates:(NS_ARRAY_OF(NSString *) *)tileURLTemplates options:(nullable NS_DICTIONARY_OF(MGLTileSourceOption, id) *)options { mbgl::Tileset tileSet = MGLTileSetFromTileURLTemplates(tileURLTemplates, options); |