fb5b8d34f2
* [ios, macos] Import headers, not implementation files * [core] Added accessors for various expression parameters Added missing parameter accessors to various expression operator classes, as well as a method on InterpolatorBase and Step that enumerates the stops and their values. * [ios, macos] Silenced warning in test of error condition * [ios, macos] Made MGLSphericalPosition boxable * [ios, macos] Implemented array enumeration during conversion * [ios, macos] Temporarily ignore heatmap layer type * [ios, macos] Migrated MGLSymbolStyleLayer.text to NSExpression MGLSymbolStyleLayer.text is now of type NSExpression instead of MGLStyleValue, as a first step toward migrating the entire layer API from style values to expressions. Implemented conversions from NSExpression to JSON arrays and vice versa. The most common NSExpression functions are now converted into style expressions, but not all of the most common style expression operators are supported yet. * [ios, macos] Implemented string coercion * [ios, macos] Color literals * [ios, macos] Null constant expressions * [ios, macos] Convert dictionary literals * [ios, macos] Interpolation expressions * [ios, macos] to-boolean, to-number, get from object * [ios, macos] Variable expressions Implemented custom expression functions for assigning and referring to variables within the context of an expression. Variables are assigned via a “context dictionary” and applied to an subexpression that is given as another argument to the same expression. Also implemented built-in variable expressions for zoom level and heatmap density. * [ios, macos] Convert colors, offsets, padding in expressions to JSON objects * [ios, macos] Expression-based style property getters Implemented a conversion from mbgl::style::PropertyValues to Objective-C JSON objects, which are then converted to NSExpressions. * [ios, macos] Consolidated property value–expression conversion in MGLStyleValueTransformer * [ios, macos] Predicate and expression guide Extracted documentation about predicates from a documentation comment in MGLVectorStyleLayer.h to a new jazzy guide. Added details about NSExpression support as well. Began updating the “For Style Authors” guide to reflect the transition from style values to expressions. * [ios, macos] Updated style authoring guide Updated the Information for Style Authors guide to discuss expressions instead of style functions. Included a table mapping style specification expression operators to NSExpression syntaxes. * [ios, macos] Migrated codegen templates to expressions * [ios, macos] Applied expression changes via codegen Ran make darwin-style-code. * [macos] Migrated macosapp to expressions * [ios, macos] Updated style function guide This guide needs to be thoroughly rewritten, but for now the example code has been migrated to expressions. * [ios, macos] Eviscerated style function tests * [ios, macos] Updated changelogs * [ios] Migrated iosapp to expressions * [ios, macos] Exposed JSON conversion methods publicly * [ios, macos] Removed MGLStyleValue, MGLStyleFunction
469 lines
28 KiB
Plaintext
469 lines
28 KiB
Plaintext
// This file is generated.
|
|
// Edit platform/darwin/scripts/generate-style-code.js, then run `make darwin-style-code`.
|
|
|
|
#import "MGLStyleLayerTests.h"
|
|
#import "../../darwin/src/NSDate+MGLAdditions.h"
|
|
|
|
#import "MGLStyleLayer_Private.h"
|
|
|
|
#include <mbgl/style/layers/fill_layer.hpp>
|
|
#include <mbgl/style/transition_options.hpp>
|
|
|
|
@interface MGLFillLayerTests : MGLStyleLayerTests
|
|
@end
|
|
|
|
@implementation MGLFillLayerTests
|
|
|
|
+ (NSString *)layerType {
|
|
return @"fill";
|
|
}
|
|
|
|
- (void)testPredicates {
|
|
MGLPointFeature *feature = [[MGLPointFeature alloc] init];
|
|
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"sourceID" shape:feature options:nil];
|
|
MGLFillStyleLayer *layer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"layerID" source:source];
|
|
|
|
XCTAssertNil(layer.sourceLayerIdentifier);
|
|
layer.sourceLayerIdentifier = @"layerID";
|
|
XCTAssertEqualObjects(layer.sourceLayerIdentifier, @"layerID");
|
|
layer.sourceLayerIdentifier = nil;
|
|
XCTAssertNil(layer.sourceLayerIdentifier);
|
|
|
|
XCTAssertNil(layer.predicate);
|
|
layer.predicate = [NSPredicate predicateWithValue:NO];
|
|
XCTAssertEqualObjects(layer.predicate, [NSPredicate predicateWithValue:NO]);
|
|
layer.predicate = nil;
|
|
XCTAssertNil(layer.predicate);
|
|
}
|
|
|
|
- (void)testProperties {
|
|
MGLPointFeature *feature = [[MGLPointFeature alloc] init];
|
|
MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"sourceID" shape:feature options:nil];
|
|
|
|
MGLFillStyleLayer *layer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"layerID" source:source];
|
|
XCTAssertNotEqual(layer.rawLayer, nullptr);
|
|
XCTAssertTrue(layer.rawLayer->is<mbgl::style::FillLayer>());
|
|
auto rawLayer = layer.rawLayer->as<mbgl::style::FillLayer>();
|
|
|
|
MGLTransition transitionTest = MGLTransitionMake(5, 4);
|
|
|
|
|
|
// fill-antialias
|
|
{
|
|
XCTAssertTrue(rawLayer->getFillAntialias().isUndefined(),
|
|
@"fill-antialias should be unset initially.");
|
|
NSExpression *defaultExpression = layer.fillAntialiased;
|
|
|
|
NSExpression *constantExpression = [NSExpression expressionWithFormat:@"false"];
|
|
layer.fillAntialiased = constantExpression;
|
|
mbgl::style::PropertyValue<bool> propertyValue = { false };
|
|
XCTAssertEqual(rawLayer->getFillAntialias(), propertyValue,
|
|
@"Setting fillAntialiased to a constant value expression should update fill-antialias.");
|
|
XCTAssertEqualObjects(layer.fillAntialiased, constantExpression,
|
|
@"fillAntialiased should round-trip constant value expressions.");
|
|
|
|
constantExpression = [NSExpression expressionWithFormat:@"false"];
|
|
NSExpression *functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
layer.fillAntialiased = functionExpression;
|
|
|
|
mbgl::style::IntervalStops<bool> intervalStops = {{
|
|
{ -INFINITY, false },
|
|
{ 18, false },
|
|
}};
|
|
propertyValue = mbgl::style::CameraFunction<bool> { intervalStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillAntialias(), propertyValue,
|
|
@"Setting fillAntialiased to a camera expression should update fill-antialias.");
|
|
XCTAssertEqualObjects(layer.fillAntialiased, functionExpression,
|
|
@"fillAntialiased should round-trip camera expressions.");
|
|
|
|
|
|
|
|
layer.fillAntialiased = nil;
|
|
XCTAssertTrue(rawLayer->getFillAntialias().isUndefined(),
|
|
@"Unsetting fillAntialiased should return fill-antialias to the default value.");
|
|
XCTAssertEqualObjects(layer.fillAntialiased, defaultExpression,
|
|
@"fillAntialiased should return the default value after being unset.");
|
|
|
|
functionExpression = [NSExpression expressionForKeyPath:@"bogus"];
|
|
XCTAssertThrowsSpecificNamed(layer.fillAntialiased = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillLayer 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:@"FUNCTION(bogus, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@10: functionExpression}];
|
|
XCTAssertThrowsSpecificNamed(layer.fillAntialiased = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillLayer should raise an exception if a camera-data expression is applied to a property that does not support key paths to feature attributes.");
|
|
}
|
|
|
|
// fill-color
|
|
{
|
|
XCTAssertTrue(rawLayer->getFillColor().isUndefined(),
|
|
@"fill-color should be unset initially.");
|
|
NSExpression *defaultExpression = layer.fillColor;
|
|
|
|
NSExpression *constantExpression = [NSExpression expressionWithFormat:@"%@", [MGLColor redColor]];
|
|
layer.fillColor = constantExpression;
|
|
mbgl::style::DataDrivenPropertyValue<mbgl::Color> propertyValue = { { 1, 0, 0, 1 } };
|
|
XCTAssertEqual(rawLayer->getFillColor(), propertyValue,
|
|
@"Setting fillColor to a constant value expression should update fill-color.");
|
|
XCTAssertEqualObjects(layer.fillColor, constantExpression,
|
|
@"fillColor should round-trip constant value expressions.");
|
|
|
|
constantExpression = [NSExpression expressionWithFormat:@"%@", [MGLColor redColor]];
|
|
NSExpression *functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
layer.fillColor = functionExpression;
|
|
|
|
mbgl::style::IntervalStops<mbgl::Color> intervalStops = {{
|
|
{ -INFINITY, { 1, 0, 0, 1 } },
|
|
{ 18, { 1, 0, 0, 1 } },
|
|
}};
|
|
propertyValue = mbgl::style::CameraFunction<mbgl::Color> { intervalStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillColor(), propertyValue,
|
|
@"Setting fillColor to a camera expression should update fill-color.");
|
|
XCTAssertEqualObjects(layer.fillColor, functionExpression,
|
|
@"fillColor should round-trip camera expressions.");
|
|
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION(keyName, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@18: constantExpression}];
|
|
layer.fillColor = functionExpression;
|
|
|
|
mbgl::style::ExponentialStops<mbgl::Color> exponentialStops = { {{18, { 1, 0, 0, 1 }}}, 1.0 };
|
|
propertyValue = mbgl::style::SourceFunction<mbgl::Color> { "keyName", exponentialStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillColor(), propertyValue,
|
|
@"Setting fillColor to a data expression should update fill-color.");
|
|
XCTAssertEqualObjects(layer.fillColor, functionExpression,
|
|
@"fillColor should round-trip data expressions.");
|
|
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@10: functionExpression}];
|
|
layer.fillColor = functionExpression;
|
|
|
|
std::map<float, mbgl::Color> innerStops { {18, { 1, 0, 0, 1 }} };
|
|
mbgl::style::CompositeExponentialStops<mbgl::Color> compositeStops { { {10.0, innerStops} }, 1.0 };
|
|
|
|
propertyValue = mbgl::style::CompositeFunction<mbgl::Color> { "keyName", compositeStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillColor(), propertyValue,
|
|
@"Setting fillColor to a camera-data expression should update fill-color.");
|
|
XCTAssertEqualObjects(layer.fillColor, functionExpression,
|
|
@"fillColor should round-trip camera-data expressions.");
|
|
|
|
|
|
layer.fillColor = nil;
|
|
XCTAssertTrue(rawLayer->getFillColor().isUndefined(),
|
|
@"Unsetting fillColor should return fill-color to the default value.");
|
|
XCTAssertEqualObjects(layer.fillColor, defaultExpression,
|
|
@"fillColor should return the default value after being unset.");
|
|
// Transition property test
|
|
layer.fillColorTransition = transitionTest;
|
|
auto toptions = rawLayer->getFillColorTransition();
|
|
XCTAssert(toptions.delay && MGLTimeIntervalFromDuration(*toptions.delay) == transitionTest.delay);
|
|
XCTAssert(toptions.duration && MGLTimeIntervalFromDuration(*toptions.duration) == transitionTest.duration);
|
|
|
|
MGLTransition fillColorTransition = layer.fillColorTransition;
|
|
XCTAssertEqual(fillColorTransition.delay, transitionTest.delay);
|
|
XCTAssertEqual(fillColorTransition.duration, transitionTest.duration);
|
|
}
|
|
|
|
// fill-opacity
|
|
{
|
|
XCTAssertTrue(rawLayer->getFillOpacity().isUndefined(),
|
|
@"fill-opacity should be unset initially.");
|
|
NSExpression *defaultExpression = layer.fillOpacity;
|
|
|
|
NSExpression *constantExpression = [NSExpression expressionWithFormat:@"0xff"];
|
|
layer.fillOpacity = constantExpression;
|
|
mbgl::style::DataDrivenPropertyValue<float> propertyValue = { 0xff };
|
|
XCTAssertEqual(rawLayer->getFillOpacity(), propertyValue,
|
|
@"Setting fillOpacity to a constant value expression should update fill-opacity.");
|
|
XCTAssertEqualObjects(layer.fillOpacity, constantExpression,
|
|
@"fillOpacity should round-trip constant value expressions.");
|
|
|
|
constantExpression = [NSExpression expressionWithFormat:@"0xff"];
|
|
NSExpression *functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
layer.fillOpacity = functionExpression;
|
|
|
|
mbgl::style::IntervalStops<float> intervalStops = {{
|
|
{ -INFINITY, 0xff },
|
|
{ 18, 0xff },
|
|
}};
|
|
propertyValue = mbgl::style::CameraFunction<float> { intervalStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillOpacity(), propertyValue,
|
|
@"Setting fillOpacity to a camera expression should update fill-opacity.");
|
|
XCTAssertEqualObjects(layer.fillOpacity, functionExpression,
|
|
@"fillOpacity should round-trip camera expressions.");
|
|
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION(keyName, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@18: constantExpression}];
|
|
layer.fillOpacity = functionExpression;
|
|
|
|
mbgl::style::ExponentialStops<float> exponentialStops = { {{18, 0xff}}, 1.0 };
|
|
propertyValue = mbgl::style::SourceFunction<float> { "keyName", exponentialStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillOpacity(), propertyValue,
|
|
@"Setting fillOpacity to a data expression should update fill-opacity.");
|
|
XCTAssertEqualObjects(layer.fillOpacity, functionExpression,
|
|
@"fillOpacity should round-trip data expressions.");
|
|
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@10: functionExpression}];
|
|
layer.fillOpacity = functionExpression;
|
|
|
|
std::map<float, float> innerStops { {18, 0xff} };
|
|
mbgl::style::CompositeExponentialStops<float> compositeStops { { {10.0, innerStops} }, 1.0 };
|
|
|
|
propertyValue = mbgl::style::CompositeFunction<float> { "keyName", compositeStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillOpacity(), propertyValue,
|
|
@"Setting fillOpacity to a camera-data expression should update fill-opacity.");
|
|
XCTAssertEqualObjects(layer.fillOpacity, functionExpression,
|
|
@"fillOpacity should round-trip camera-data expressions.");
|
|
|
|
|
|
layer.fillOpacity = nil;
|
|
XCTAssertTrue(rawLayer->getFillOpacity().isUndefined(),
|
|
@"Unsetting fillOpacity should return fill-opacity to the default value.");
|
|
XCTAssertEqualObjects(layer.fillOpacity, defaultExpression,
|
|
@"fillOpacity should return the default value after being unset.");
|
|
// Transition property test
|
|
layer.fillOpacityTransition = transitionTest;
|
|
auto toptions = rawLayer->getFillOpacityTransition();
|
|
XCTAssert(toptions.delay && MGLTimeIntervalFromDuration(*toptions.delay) == transitionTest.delay);
|
|
XCTAssert(toptions.duration && MGLTimeIntervalFromDuration(*toptions.duration) == transitionTest.duration);
|
|
|
|
MGLTransition fillOpacityTransition = layer.fillOpacityTransition;
|
|
XCTAssertEqual(fillOpacityTransition.delay, transitionTest.delay);
|
|
XCTAssertEqual(fillOpacityTransition.duration, transitionTest.duration);
|
|
}
|
|
|
|
// fill-outline-color
|
|
{
|
|
XCTAssertTrue(rawLayer->getFillOutlineColor().isUndefined(),
|
|
@"fill-outline-color should be unset initially.");
|
|
NSExpression *defaultExpression = layer.fillOutlineColor;
|
|
|
|
NSExpression *constantExpression = [NSExpression expressionWithFormat:@"%@", [MGLColor redColor]];
|
|
layer.fillOutlineColor = constantExpression;
|
|
mbgl::style::DataDrivenPropertyValue<mbgl::Color> propertyValue = { { 1, 0, 0, 1 } };
|
|
XCTAssertEqual(rawLayer->getFillOutlineColor(), propertyValue,
|
|
@"Setting fillOutlineColor to a constant value expression should update fill-outline-color.");
|
|
XCTAssertEqualObjects(layer.fillOutlineColor, constantExpression,
|
|
@"fillOutlineColor should round-trip constant value expressions.");
|
|
|
|
constantExpression = [NSExpression expressionWithFormat:@"%@", [MGLColor redColor]];
|
|
NSExpression *functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
layer.fillOutlineColor = functionExpression;
|
|
|
|
mbgl::style::IntervalStops<mbgl::Color> intervalStops = {{
|
|
{ -INFINITY, { 1, 0, 0, 1 } },
|
|
{ 18, { 1, 0, 0, 1 } },
|
|
}};
|
|
propertyValue = mbgl::style::CameraFunction<mbgl::Color> { intervalStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillOutlineColor(), propertyValue,
|
|
@"Setting fillOutlineColor to a camera expression should update fill-outline-color.");
|
|
XCTAssertEqualObjects(layer.fillOutlineColor, functionExpression,
|
|
@"fillOutlineColor should round-trip camera expressions.");
|
|
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION(keyName, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@18: constantExpression}];
|
|
layer.fillOutlineColor = functionExpression;
|
|
|
|
mbgl::style::ExponentialStops<mbgl::Color> exponentialStops = { {{18, { 1, 0, 0, 1 }}}, 1.0 };
|
|
propertyValue = mbgl::style::SourceFunction<mbgl::Color> { "keyName", exponentialStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillOutlineColor(), propertyValue,
|
|
@"Setting fillOutlineColor to a data expression should update fill-outline-color.");
|
|
XCTAssertEqualObjects(layer.fillOutlineColor, functionExpression,
|
|
@"fillOutlineColor should round-trip data expressions.");
|
|
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@10: functionExpression}];
|
|
layer.fillOutlineColor = functionExpression;
|
|
|
|
std::map<float, mbgl::Color> innerStops { {18, { 1, 0, 0, 1 }} };
|
|
mbgl::style::CompositeExponentialStops<mbgl::Color> compositeStops { { {10.0, innerStops} }, 1.0 };
|
|
|
|
propertyValue = mbgl::style::CompositeFunction<mbgl::Color> { "keyName", compositeStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillOutlineColor(), propertyValue,
|
|
@"Setting fillOutlineColor to a camera-data expression should update fill-outline-color.");
|
|
XCTAssertEqualObjects(layer.fillOutlineColor, functionExpression,
|
|
@"fillOutlineColor should round-trip camera-data expressions.");
|
|
|
|
|
|
layer.fillOutlineColor = nil;
|
|
XCTAssertTrue(rawLayer->getFillOutlineColor().isUndefined(),
|
|
@"Unsetting fillOutlineColor should return fill-outline-color to the default value.");
|
|
XCTAssertEqualObjects(layer.fillOutlineColor, defaultExpression,
|
|
@"fillOutlineColor should return the default value after being unset.");
|
|
// Transition property test
|
|
layer.fillOutlineColorTransition = transitionTest;
|
|
auto toptions = rawLayer->getFillOutlineColorTransition();
|
|
XCTAssert(toptions.delay && MGLTimeIntervalFromDuration(*toptions.delay) == transitionTest.delay);
|
|
XCTAssert(toptions.duration && MGLTimeIntervalFromDuration(*toptions.duration) == transitionTest.duration);
|
|
|
|
MGLTransition fillOutlineColorTransition = layer.fillOutlineColorTransition;
|
|
XCTAssertEqual(fillOutlineColorTransition.delay, transitionTest.delay);
|
|
XCTAssertEqual(fillOutlineColorTransition.duration, transitionTest.duration);
|
|
}
|
|
|
|
// fill-pattern
|
|
{
|
|
XCTAssertTrue(rawLayer->getFillPattern().isUndefined(),
|
|
@"fill-pattern should be unset initially.");
|
|
NSExpression *defaultExpression = layer.fillPattern;
|
|
|
|
NSExpression *constantExpression = [NSExpression expressionWithFormat:@"'Fill Pattern'"];
|
|
layer.fillPattern = constantExpression;
|
|
mbgl::style::PropertyValue<std::string> propertyValue = { "Fill Pattern" };
|
|
XCTAssertEqual(rawLayer->getFillPattern(), propertyValue,
|
|
@"Setting fillPattern to a constant value expression should update fill-pattern.");
|
|
XCTAssertEqualObjects(layer.fillPattern, constantExpression,
|
|
@"fillPattern should round-trip constant value expressions.");
|
|
|
|
constantExpression = [NSExpression expressionWithFormat:@"'Fill Pattern'"];
|
|
NSExpression *functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
layer.fillPattern = functionExpression;
|
|
|
|
mbgl::style::IntervalStops<std::string> intervalStops = {{
|
|
{ -INFINITY, "Fill Pattern" },
|
|
{ 18, "Fill Pattern" },
|
|
}};
|
|
propertyValue = mbgl::style::CameraFunction<std::string> { intervalStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillPattern(), propertyValue,
|
|
@"Setting fillPattern to a camera expression should update fill-pattern.");
|
|
XCTAssertEqualObjects(layer.fillPattern, functionExpression,
|
|
@"fillPattern should round-trip camera expressions.");
|
|
|
|
|
|
|
|
layer.fillPattern = nil;
|
|
XCTAssertTrue(rawLayer->getFillPattern().isUndefined(),
|
|
@"Unsetting fillPattern should return fill-pattern to the default value.");
|
|
XCTAssertEqualObjects(layer.fillPattern, defaultExpression,
|
|
@"fillPattern should return the default value after being unset.");
|
|
|
|
functionExpression = [NSExpression expressionForKeyPath:@"bogus"];
|
|
XCTAssertThrowsSpecificNamed(layer.fillPattern = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillLayer 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:@"FUNCTION(bogus, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@10: functionExpression}];
|
|
XCTAssertThrowsSpecificNamed(layer.fillPattern = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillLayer should raise an exception if a camera-data expression is applied to a property that does not support key paths to feature attributes.");
|
|
// Transition property test
|
|
layer.fillPatternTransition = transitionTest;
|
|
auto toptions = rawLayer->getFillPatternTransition();
|
|
XCTAssert(toptions.delay && MGLTimeIntervalFromDuration(*toptions.delay) == transitionTest.delay);
|
|
XCTAssert(toptions.duration && MGLTimeIntervalFromDuration(*toptions.duration) == transitionTest.duration);
|
|
|
|
MGLTransition fillPatternTransition = layer.fillPatternTransition;
|
|
XCTAssertEqual(fillPatternTransition.delay, transitionTest.delay);
|
|
XCTAssertEqual(fillPatternTransition.duration, transitionTest.duration);
|
|
}
|
|
|
|
// fill-translate
|
|
{
|
|
XCTAssertTrue(rawLayer->getFillTranslate().isUndefined(),
|
|
@"fill-translate should be unset initially.");
|
|
NSExpression *defaultExpression = layer.fillTranslation;
|
|
|
|
NSExpression *constantExpression = [NSExpression expressionWithFormat:@"%@",
|
|
#if TARGET_OS_IPHONE
|
|
[NSValue valueWithCGVector:CGVectorMake(1, 1)]
|
|
#else
|
|
[NSValue valueWithMGLVector:CGVectorMake(1, -1)]
|
|
#endif
|
|
];
|
|
layer.fillTranslation = constantExpression;
|
|
mbgl::style::PropertyValue<std::array<float, 2>> propertyValue = { { 1, 1 } };
|
|
XCTAssertEqual(rawLayer->getFillTranslate(), propertyValue,
|
|
@"Setting fillTranslation to a constant value expression should update fill-translate.");
|
|
XCTAssertEqualObjects(layer.fillTranslation, constantExpression,
|
|
@"fillTranslation should round-trip constant value expressions.");
|
|
|
|
constantExpression = [NSExpression expressionWithFormat:@"{1, 1}"];
|
|
NSExpression *functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
layer.fillTranslation = functionExpression;
|
|
|
|
mbgl::style::IntervalStops<std::array<float, 2>> intervalStops = {{
|
|
{ -INFINITY, { 1, 1 } },
|
|
{ 18, { 1, 1 } },
|
|
}};
|
|
propertyValue = mbgl::style::CameraFunction<std::array<float, 2>> { intervalStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillTranslate(), propertyValue,
|
|
@"Setting fillTranslation to a camera expression should update fill-translate.");
|
|
XCTAssertEqualObjects(layer.fillTranslation, functionExpression,
|
|
@"fillTranslation should round-trip camera expressions.");
|
|
|
|
|
|
|
|
layer.fillTranslation = nil;
|
|
XCTAssertTrue(rawLayer->getFillTranslate().isUndefined(),
|
|
@"Unsetting fillTranslation should return fill-translate to the default value.");
|
|
XCTAssertEqualObjects(layer.fillTranslation, defaultExpression,
|
|
@"fillTranslation should return the default value after being unset.");
|
|
|
|
functionExpression = [NSExpression expressionForKeyPath:@"bogus"];
|
|
XCTAssertThrowsSpecificNamed(layer.fillTranslation = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillLayer 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:@"FUNCTION(bogus, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@10: functionExpression}];
|
|
XCTAssertThrowsSpecificNamed(layer.fillTranslation = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillLayer should raise an exception if a camera-data expression is applied to a property that does not support key paths to feature attributes.");
|
|
}
|
|
|
|
// fill-translate-anchor
|
|
{
|
|
XCTAssertTrue(rawLayer->getFillTranslateAnchor().isUndefined(),
|
|
@"fill-translate-anchor should be unset initially.");
|
|
NSExpression *defaultExpression = layer.fillTranslationAnchor;
|
|
|
|
NSExpression *constantExpression = [NSExpression expressionWithFormat:@"'viewport'"];
|
|
layer.fillTranslationAnchor = constantExpression;
|
|
mbgl::style::PropertyValue<mbgl::style::TranslateAnchorType> propertyValue = { mbgl::style::TranslateAnchorType::Viewport };
|
|
XCTAssertEqual(rawLayer->getFillTranslateAnchor(), propertyValue,
|
|
@"Setting fillTranslationAnchor to a constant value expression should update fill-translate-anchor.");
|
|
XCTAssertEqualObjects(layer.fillTranslationAnchor, constantExpression,
|
|
@"fillTranslationAnchor should round-trip constant value expressions.");
|
|
|
|
constantExpression = [NSExpression expressionWithFormat:@"'viewport'"];
|
|
NSExpression *functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
layer.fillTranslationAnchor = functionExpression;
|
|
|
|
mbgl::style::IntervalStops<mbgl::style::TranslateAnchorType> intervalStops = {{
|
|
{ -INFINITY, mbgl::style::TranslateAnchorType::Viewport },
|
|
{ 18, mbgl::style::TranslateAnchorType::Viewport },
|
|
}};
|
|
propertyValue = mbgl::style::CameraFunction<mbgl::style::TranslateAnchorType> { intervalStops };
|
|
|
|
XCTAssertEqual(rawLayer->getFillTranslateAnchor(), propertyValue,
|
|
@"Setting fillTranslationAnchor to a camera expression should update fill-translate-anchor.");
|
|
XCTAssertEqualObjects(layer.fillTranslationAnchor, functionExpression,
|
|
@"fillTranslationAnchor should round-trip camera expressions.");
|
|
|
|
|
|
|
|
layer.fillTranslationAnchor = nil;
|
|
XCTAssertTrue(rawLayer->getFillTranslateAnchor().isUndefined(),
|
|
@"Unsetting fillTranslationAnchor should return fill-translate-anchor to the default value.");
|
|
XCTAssertEqualObjects(layer.fillTranslationAnchor, defaultExpression,
|
|
@"fillTranslationAnchor should return the default value after being unset.");
|
|
|
|
functionExpression = [NSExpression expressionForKeyPath:@"bogus"];
|
|
XCTAssertThrowsSpecificNamed(layer.fillTranslationAnchor = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillLayer 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:@"FUNCTION(bogus, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}];
|
|
functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@10: functionExpression}];
|
|
XCTAssertThrowsSpecificNamed(layer.fillTranslationAnchor = functionExpression, NSException, NSInvalidArgumentException, @"MGLFillLayer should raise an exception if a camera-data expression is applied to a property that does not support key paths to feature attributes.");
|
|
}
|
|
}
|
|
|
|
- (void)testPropertyNames {
|
|
[self testPropertyName:@"is-fill-antialiased" isBoolean:YES];
|
|
[self testPropertyName:@"fill-color" isBoolean:NO];
|
|
[self testPropertyName:@"fill-opacity" isBoolean:NO];
|
|
[self testPropertyName:@"fill-outline-color" isBoolean:NO];
|
|
[self testPropertyName:@"fill-pattern" isBoolean:NO];
|
|
[self testPropertyName:@"fill-translation" isBoolean:NO];
|
|
[self testPropertyName:@"fill-translation-anchor" isBoolean:NO];
|
|
}
|
|
|
|
- (void)testValueAdditions {
|
|
XCTAssertEqual([NSValue valueWithMGLFillTranslationAnchor:MGLFillTranslationAnchorMap].MGLFillTranslationAnchorValue, MGLFillTranslationAnchorMap);
|
|
XCTAssertEqual([NSValue valueWithMGLFillTranslationAnchor:MGLFillTranslationAnchorViewport].MGLFillTranslationAnchorValue, MGLFillTranslationAnchorViewport);
|
|
}
|
|
|
|
@end
|