diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2017-01-16 11:38:35 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2017-01-16 11:38:35 -0800 |
commit | 7ef2843e6a62116667be6a2c12de085951fdd5ea (patch) | |
tree | 40eca249e044e2706efd1193d617e6eb8e59d708 /platform/darwin/src/MGLRasterStyleLayer.mm | |
parent | 76301b252cbc4bc3ae1fc84322bcbcdbd26cae8a (diff) | |
parent | 13b97dd0cebffe36b187bdb74923910def6bd87b (diff) | |
download | qtlocation-mapboxgl-7ef2843e6a62116667be6a2c12de085951fdd5ea.tar.gz |
Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.7
Diffstat (limited to 'platform/darwin/src/MGLRasterStyleLayer.mm')
-rw-r--r-- | platform/darwin/src/MGLRasterStyleLayer.mm | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm index e61532773c..87afb8da9d 100644 --- a/platform/darwin/src/MGLRasterStyleLayer.mm +++ b/platform/darwin/src/MGLRasterStyleLayer.mm @@ -1,5 +1,5 @@ // This file is generated. -// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`. +// Edit platform/darwin/scripts/generate-style-code.js, then run `make darwin-style-code`. #import "MGLSource.h" #import "MGLMapView_Private.h" @@ -8,6 +8,7 @@ #import "MGLStyleValue_Private.h" #import "MGLRasterStyleLayer.h" +#include <mbgl/map/map.hpp> #include <mbgl/style/layers/raster_layer.hpp> @interface MGLRasterStyleLayer () @@ -41,6 +42,13 @@ super.rawLayer = rawLayer; } +- (NSString *)sourceIdentifier +{ + MGLAssertStyleLayerIsValid(); + + return @(self.rawLayer->getSourceID().c_str()); +} + #pragma mark - Adding to and removing from a map view - (void)addToMapView:(MGLMapView *)mapView belowLayer:(MGLStyleLayer *)otherLayer @@ -96,9 +104,11 @@ return MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(propertyValue); } - - (void)setRasterBrightnessMax:(MGLStyleValue<NSNumber *> *)rasterBrightnessMax { - NSAssert(NO, @"Use -setMaximumRasterBrightness: instead."); +} + +- (MGLStyleValue<NSNumber *> *)rasterBrightnessMax { + return self.maximumRasterBrightness; } - (void)setMinimumRasterBrightness:(MGLStyleValue<NSNumber *> *)minimumRasterBrightness { @@ -115,9 +125,11 @@ return MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(propertyValue); } - - (void)setRasterBrightnessMin:(MGLStyleValue<NSNumber *> *)rasterBrightnessMin { - NSAssert(NO, @"Use -setMinimumRasterBrightness: instead."); +} + +- (MGLStyleValue<NSNumber *> *)rasterBrightnessMin { + return self.minimumRasterBrightness; } - (void)setRasterContrast:(MGLStyleValue<NSNumber *> *)rasterContrast { @@ -162,9 +174,11 @@ return MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(propertyValue); } - - (void)setRasterHueRotate:(MGLStyleValue<NSNumber *> *)rasterHueRotate { - NSAssert(NO, @"Use -setRasterHueRotation: instead."); +} + +- (MGLStyleValue<NSNumber *> *)rasterHueRotate { + return self.rasterHueRotation; } - (void)setRasterOpacity:(MGLStyleValue<NSNumber *> *)rasterOpacity { |