diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-13 18:14:12 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-20 11:56:30 -0700 |
commit | c8edbb0500cbf4baf1d5fdb0e63679539e166585 (patch) | |
tree | 750f3b72b9e3b1c91ddbc0541cfc64d7d80ffe71 /platform/darwin/test/MGLFillStyleLayerTests.mm | |
parent | 6d7072162b764c2432c010cd463a5a2c0093d606 (diff) | |
download | qtlocation-mapboxgl-c8edbb0500cbf4baf1d5fdb0e63679539e166585.tar.gz |
[core] Replace {Source,Camera,Composite}Function with PropertyExpression
Diffstat (limited to 'platform/darwin/test/MGLFillStyleLayerTests.mm')
-rw-r--r-- | platform/darwin/test/MGLFillStyleLayerTests.mm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/platform/darwin/test/MGLFillStyleLayerTests.mm b/platform/darwin/test/MGLFillStyleLayerTests.mm index 3789133bc6..921b59416b 100644 --- a/platform/darwin/test/MGLFillStyleLayerTests.mm +++ b/platform/darwin/test/MGLFillStyleLayerTests.mm @@ -69,7 +69,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CameraFunction<bool>( + propertyValue = mbgl::style::PropertyExpression<bool>( step(zoom(), literal(false), 18.0, literal(false)) ); } @@ -113,7 +113,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CameraFunction<mbgl::Color>( + propertyValue = mbgl::style::PropertyExpression<mbgl::Color>( step(zoom(), literal(mbgl::Color(1, 0, 0, 1)), 18.0, literal(mbgl::Color(1, 0, 0, 1))) ); } @@ -128,7 +128,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::SourceFunction<mbgl::Color>( + propertyValue = mbgl::style::PropertyExpression<mbgl::Color>( interpolate(linear(), number(get("keyName")), 18.0, literal(mbgl::Color(1, 0, 0, 1))) ); } @@ -144,7 +144,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CompositeFunction<mbgl::Color>( + propertyValue = mbgl::style::PropertyExpression<mbgl::Color>( interpolate(linear(), zoom(), 10.0, interpolate(linear(), number(get("keyName")), 18.0, literal(mbgl::Color(1, 0, 0, 1)))) ); } @@ -191,7 +191,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CameraFunction<float>( + propertyValue = mbgl::style::PropertyExpression<float>( step(zoom(), literal(1.0), 18.0, literal(1.0)) ); } @@ -206,7 +206,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::SourceFunction<float>( + propertyValue = mbgl::style::PropertyExpression<float>( interpolate(linear(), number(get("keyName")), 18.0, literal(1.0)) ); } @@ -222,7 +222,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CompositeFunction<float>( + propertyValue = mbgl::style::PropertyExpression<float>( interpolate(linear(), zoom(), 10.0, interpolate(linear(), number(get("keyName")), 18.0, literal(1.0))) ); } @@ -269,7 +269,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CameraFunction<mbgl::Color>( + propertyValue = mbgl::style::PropertyExpression<mbgl::Color>( step(zoom(), literal(mbgl::Color(1, 0, 0, 1)), 18.0, literal(mbgl::Color(1, 0, 0, 1))) ); } @@ -284,7 +284,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::SourceFunction<mbgl::Color>( + propertyValue = mbgl::style::PropertyExpression<mbgl::Color>( interpolate(linear(), number(get("keyName")), 18.0, literal(mbgl::Color(1, 0, 0, 1))) ); } @@ -300,7 +300,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CompositeFunction<mbgl::Color>( + propertyValue = mbgl::style::PropertyExpression<mbgl::Color>( interpolate(linear(), zoom(), 10.0, interpolate(linear(), number(get("keyName")), 18.0, literal(mbgl::Color(1, 0, 0, 1)))) ); } @@ -347,7 +347,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CameraFunction<std::string>( + propertyValue = mbgl::style::PropertyExpression<std::string>( step(zoom(), literal("Fill Pattern"), 18.0, literal("Fill Pattern")) ); } @@ -406,7 +406,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CameraFunction<std::array<float, 2>>( + propertyValue = mbgl::style::PropertyExpression<std::array<float, 2>>( step(zoom(), literal({ 1, 1 }), 18.0, literal({ 1, 1 })) ); } @@ -450,7 +450,7 @@ { using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::CameraFunction<mbgl::style::TranslateAnchorType>( + propertyValue = mbgl::style::PropertyExpression<mbgl::style::TranslateAnchorType>( step(zoom(), literal("viewport"), 18.0, literal("viewport")) ); } |