diff options
Diffstat (limited to 'platform/darwin')
4 files changed, 99 insertions, 1 deletions
diff --git a/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json b/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json index dfc7d76a3c..ce313ddbb9 100644 --- a/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json +++ b/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json @@ -32,7 +32,8 @@ }, "paint_fill-extrusion": { "fill-extrusion-translate": "fill-extrusion-translation", - "fill-extrusion-translate-anchor": "fill-extrusion-translation-anchor" + "fill-extrusion-translate-anchor": "fill-extrusion-translation-anchor", + "fill-extrusion-vertical-gradient": "fill-extrusion-has-vertical-gradient" }, "paint_raster": { "raster-brightness-min": "minimum-raster-brightness", diff --git a/platform/darwin/src/MGLFillExtrusionStyleLayer.h b/platform/darwin/src/MGLFillExtrusionStyleLayer.h index 6e807c1b44..98eb6b3c20 100644 --- a/platform/darwin/src/MGLFillExtrusionStyleLayer.h +++ b/platform/darwin/src/MGLFillExtrusionStyleLayer.h @@ -164,6 +164,33 @@ MGL_EXPORT @property (nonatomic) MGLTransition fillExtrusionColorTransition; /** + Whether to apply a vertical gradient to the sides of a fill-extrusion layer. If + true, sides will be shaded slightly darker farther down. + + The default value of this property is an expression that evaluates to `YES`. + Set this property to `nil` to reset it to the default value. + + This attribute corresponds to the <a + href="https://www.mapbox.com/mapbox-gl-style-spec/#paint-fill-extrusion-vertical-gradient"><code>fill-extrusion-vertical-gradient</code></a> + layout property in the Mapbox Style Specification. + + You can set this property to an expression containing any of the following: + + * Constant Boolean values + * Predefined functions, including mathematical and string operators + * Conditional expressions + * Variable assignments and references to assigned variables + * Step functions applied to the `$zoomLevel` variable + + This property does not support applying interpolation functions to the + `$zoomLevel` variable or applying interpolation or step functions to feature + attributes. + */ +@property (nonatomic, null_resettable) NSExpression *fillExtrusionHasVerticalGradient; + +@property (nonatomic, null_resettable) NSExpression *fillExtrusionVerticalGradient __attribute__((unavailable("Use fillExtrusionHasVerticalGradient instead."))); + +/** The height with which to extrude this layer. This property is measured in meters. diff --git a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm index 03676a4ed5..e4e9c707ea 100644 --- a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm +++ b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm @@ -156,6 +156,31 @@ namespace mbgl { return transition; } +- (void)setFillExtrusionHasVerticalGradient:(NSExpression *)fillExtrusionHasVerticalGradient { + MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting fillExtrusionHasVerticalGradient: %@", fillExtrusionHasVerticalGradient); + + auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(fillExtrusionHasVerticalGradient, false); + self.rawLayer->setFillExtrusionVerticalGradient(mbglValue); +} + +- (NSExpression *)fillExtrusionHasVerticalGradient { + MGLAssertStyleLayerIsValid(); + + auto propertyValue = self.rawLayer->getFillExtrusionVerticalGradient(); + if (propertyValue.isUndefined()) { + propertyValue = self.rawLayer->getDefaultFillExtrusionVerticalGradient(); + } + return MGLStyleValueTransformer<bool, NSNumber *>().toExpression(propertyValue); +} + +- (void)setFillExtrusionVerticalGradient:(NSExpression *)fillExtrusionVerticalGradient { +} + +- (NSExpression *)fillExtrusionVerticalGradient { + return self.fillExtrusionHasVerticalGradient; +} + - (void)setFillExtrusionHeight:(NSExpression *)fillExtrusionHeight { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting fillExtrusionHeight: %@", fillExtrusionHeight); diff --git a/platform/darwin/test/MGLFillExtrusionStyleLayerTests.mm b/platform/darwin/test/MGLFillExtrusionStyleLayerTests.mm index ecfa2134a0..357ee888bc 100644 --- a/platform/darwin/test/MGLFillExtrusionStyleLayerTests.mm +++ b/platform/darwin/test/MGLFillExtrusionStyleLayerTests.mm @@ -205,6 +205,50 @@ XCTAssertEqual(fillExtrusionColorTransition.duration, transitionTest.duration); } + // fill-extrusion-vertical-gradient + { + XCTAssertTrue(rawLayer->getFillExtrusionVerticalGradient().isUndefined(), + @"fill-extrusion-vertical-gradient should be unset initially."); + NSExpression *defaultExpression = layer.fillExtrusionHasVerticalGradient; + + NSExpression *constantExpression = [NSExpression expressionWithFormat:@"false"]; + layer.fillExtrusionHasVerticalGradient = constantExpression; + mbgl::style::PropertyValue<bool> propertyValue = { false }; + XCTAssertEqual(rawLayer->getFillExtrusionVerticalGradient(), propertyValue, + @"Setting fillExtrusionHasVerticalGradient to a constant value expression should update fill-extrusion-vertical-gradient."); + XCTAssertEqualObjects(layer.fillExtrusionHasVerticalGradient, constantExpression, + @"fillExtrusionHasVerticalGradient should round-trip constant value expressions."); + + constantExpression = [NSExpression expressionWithFormat:@"false"]; + NSExpression *functionExpression = [NSExpression expressionWithFormat:@"mgl_step:from:stops:($zoomLevel, %@, %@)", constantExpression, @{@18: constantExpression}]; + layer.fillExtrusionHasVerticalGradient = functionExpression; + + { + using namespace mbgl::style::expression::dsl; + propertyValue = mbgl::style::PropertyExpression<bool>( + step(zoom(), literal(false), 18.0, literal(false)) + ); + } + + XCTAssertEqual(rawLayer->getFillExtrusionVerticalGradient(), propertyValue, + @"Setting fillExtrusionHasVerticalGradient to a camera expression should update fill-extrusion-vertical-gradient."); + XCTAssertEqualObjects(layer.fillExtrusionHasVerticalGradient, functionExpression, + @"fillExtrusionHasVerticalGradient should round-trip camera expressions."); + + + layer.fillExtrusionHasVerticalGradient = nil; + XCTAssertTrue(rawLayer->getFillExtrusionVerticalGradient().isUndefined(), + @"Unsetting fillExtrusionHasVerticalGradient should return fill-extrusion-vertical-gradient to the default value."); + XCTAssertEqualObjects(layer.fillExtrusionHasVerticalGradient, defaultExpression, + @"fillExtrusionHasVerticalGradient should return the default value after being unset."); + + functionExpression = [NSExpression expressionForKeyPath:@"bogus"]; + XCTAssertThrowsSpecificNamed(layer.fillExtrusionHasVerticalGradient = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillExtrusionLayer should raise an exception if a camera-data expression is applied to a property that does not support key paths to feature attributes."); + functionExpression = [NSExpression expressionWithFormat:@"mgl_step:from:stops:(bogus, %@, %@)", constantExpression, @{@18: constantExpression}]; + functionExpression = [NSExpression expressionWithFormat:@"mgl_interpolate:withCurveType:parameters:stops:($zoomLevel, 'linear', nil, %@)", @{@10: functionExpression}]; + XCTAssertThrowsSpecificNamed(layer.fillExtrusionHasVerticalGradient = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillExtrusionLayer should raise an exception if a camera-data expression is applied to a property that does not support key paths to feature attributes."); + } + // fill-extrusion-height { XCTAssertTrue(rawLayer->getFillExtrusionHeight().isUndefined(), @@ -481,6 +525,7 @@ - (void)testPropertyNames { [self testPropertyName:@"fill-extrusion-base" isBoolean:NO]; [self testPropertyName:@"fill-extrusion-color" isBoolean:NO]; + [self testPropertyName:@"fill-extrusion-has-vertical-gradient" isBoolean:YES]; [self testPropertyName:@"fill-extrusion-height" isBoolean:NO]; [self testPropertyName:@"fill-extrusion-opacity" isBoolean:NO]; [self testPropertyName:@"fill-extrusion-pattern" isBoolean:NO]; |