summaryrefslogtreecommitdiff
path: root/platform/darwin/test/MGLSymbolStyleLayerTests.mm
diff options
context:
space:
mode:
Diffstat (limited to 'platform/darwin/test/MGLSymbolStyleLayerTests.mm')
-rw-r--r--platform/darwin/test/MGLSymbolStyleLayerTests.mm172
1 files changed, 86 insertions, 86 deletions
diff --git a/platform/darwin/test/MGLSymbolStyleLayerTests.mm b/platform/darwin/test/MGLSymbolStyleLayerTests.mm
index f22ea04f6e..7566617872 100644
--- a/platform/darwin/test/MGLSymbolStyleLayerTests.mm
+++ b/platform/darwin/test/MGLSymbolStyleLayerTests.mm
@@ -69,7 +69,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<bool>(
+ propertyValue = mbgl::style::PropertyExpression<bool>(
step(zoom(), literal(true), 18.0, literal(true))
);
}
@@ -113,7 +113,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::SymbolAnchorType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::SymbolAnchorType>(
step(zoom(), literal("bottom-right"), 18.0, literal("bottom-right"))
);
}
@@ -151,7 +151,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<bool>(
+ propertyValue = mbgl::style::PropertyExpression<bool>(
step(zoom(), literal(true), 18.0, literal(true))
);
}
@@ -195,7 +195,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<std::string>(
+ propertyValue = mbgl::style::PropertyExpression<std::string>(
step(zoom(), literal("Icon Image"), 18.0, literal("Icon Image"))
);
}
@@ -239,7 +239,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 }))
);
}
@@ -254,7 +254,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::SourceFunction<std::array<float, 2>>(
+ propertyValue = mbgl::style::PropertyExpression<std::array<float, 2>>(
interpolate(linear(), number(get("keyName")), 18.0, literal({ 1, 1 }))
);
}
@@ -270,7 +270,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CompositeFunction<std::array<float, 2>>(
+ propertyValue = mbgl::style::PropertyExpression<std::array<float, 2>>(
interpolate(linear(), zoom(), 10.0, interpolate(linear(), number(get("keyName")), 18.0, literal({ 1, 1 })))
);
}
@@ -308,7 +308,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<bool>(
+ propertyValue = mbgl::style::PropertyExpression<bool>(
step(zoom(), literal(true), 18.0, literal(true))
);
}
@@ -352,7 +352,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))
);
}
@@ -396,7 +396,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::AlignmentType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::AlignmentType>(
step(zoom(), literal("auto"), 18.0, literal("auto"))
);
}
@@ -440,7 +440,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))
);
}
@@ -455,7 +455,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))
);
}
@@ -471,7 +471,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)))
);
}
@@ -509,7 +509,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::AlignmentType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::AlignmentType>(
step(zoom(), literal("auto"), 18.0, literal("auto"))
);
}
@@ -553,7 +553,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))
);
}
@@ -568,7 +568,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))
);
}
@@ -584,7 +584,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)))
);
}
@@ -622,7 +622,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::IconTextFitType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::IconTextFitType>(
step(zoom(), literal("both"), 18.0, literal("both"))
);
}
@@ -672,7 +672,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<std::array<float, 4>>(
+ propertyValue = mbgl::style::PropertyExpression<std::array<float, 4>>(
step(zoom(), literal({ 1, 1, 1, 1 }), 18.0, literal({ 1, 1, 1, 1 }))
);
}
@@ -716,7 +716,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<bool>(
+ propertyValue = mbgl::style::PropertyExpression<bool>(
step(zoom(), literal(true), 18.0, literal(true))
);
}
@@ -760,7 +760,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))
);
}
@@ -804,7 +804,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))
);
}
@@ -848,7 +848,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))
);
}
@@ -863,7 +863,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))
);
}
@@ -879,7 +879,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)))
);
}
@@ -917,7 +917,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<bool>(
+ propertyValue = mbgl::style::PropertyExpression<bool>(
step(zoom(), literal(true), 18.0, literal(true))
);
}
@@ -961,7 +961,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::SymbolPlacementType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::SymbolPlacementType>(
step(zoom(), literal("line"), 18.0, literal("line"))
);
}
@@ -1005,7 +1005,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))
);
}
@@ -1049,7 +1049,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<std::string>(
+ propertyValue = mbgl::style::PropertyExpression<std::string>(
step(zoom(), literal("Text Field"), 18.0, literal("Text Field"))
);
}
@@ -1087,7 +1087,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<bool>(
+ propertyValue = mbgl::style::PropertyExpression<bool>(
step(zoom(), literal(true), 18.0, literal(true))
);
}
@@ -1131,7 +1131,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::SymbolAnchorType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::SymbolAnchorType>(
step(zoom(), literal("bottom-right"), 18.0, literal("bottom-right"))
);
}
@@ -1169,7 +1169,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<std::vector<std::string>>(
+ propertyValue = mbgl::style::PropertyExpression<std::vector<std::string>>(
step(zoom(), literal({ "Text Font", "Tnof Txet" }), 18.0, literal({ "Text Font", "Tnof Txet" }))
);
}
@@ -1207,7 +1207,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))
);
}
@@ -1222,7 +1222,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))
);
}
@@ -1238,7 +1238,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)))
);
}
@@ -1276,7 +1276,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<bool>(
+ propertyValue = mbgl::style::PropertyExpression<bool>(
step(zoom(), literal(true), 18.0, literal(true))
);
}
@@ -1320,7 +1320,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::TextJustifyType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::TextJustifyType>(
step(zoom(), literal("right"), 18.0, literal("right"))
);
}
@@ -1358,7 +1358,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))
);
}
@@ -1373,7 +1373,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))
);
}
@@ -1389,7 +1389,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)))
);
}
@@ -1427,7 +1427,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))
);
}
@@ -1477,7 +1477,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 }))
);
}
@@ -1492,7 +1492,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::SourceFunction<std::array<float, 2>>(
+ propertyValue = mbgl::style::PropertyExpression<std::array<float, 2>>(
interpolate(linear(), number(get("keyName")), 18.0, literal({ 1, 1 }))
);
}
@@ -1508,7 +1508,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CompositeFunction<std::array<float, 2>>(
+ propertyValue = mbgl::style::PropertyExpression<std::array<float, 2>>(
interpolate(linear(), zoom(), 10.0, interpolate(linear(), number(get("keyName")), 18.0, literal({ 1, 1 })))
);
}
@@ -1546,7 +1546,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<bool>(
+ propertyValue = mbgl::style::PropertyExpression<bool>(
step(zoom(), literal(true), 18.0, literal(true))
);
}
@@ -1590,7 +1590,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))
);
}
@@ -1634,7 +1634,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::AlignmentType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::AlignmentType>(
step(zoom(), literal("auto"), 18.0, literal("auto"))
);
}
@@ -1678,7 +1678,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))
);
}
@@ -1693,7 +1693,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))
);
}
@@ -1709,7 +1709,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)))
);
}
@@ -1747,7 +1747,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::AlignmentType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::AlignmentType>(
step(zoom(), literal("auto"), 18.0, literal("auto"))
);
}
@@ -1791,7 +1791,7 @@
{
using namespace mbgl::style::expression::dsl;
- propertyValue = mbgl::style::CameraFunction<mbgl::style::TextTransformType>(
+ propertyValue = mbgl::style::PropertyExpression<mbgl::style::TextTransformType>(
step(zoom(), literal("lowercase"), 18.0, literal("lowercase"))
);
}
@@ -1829,7 +1829,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)))
);
}
@@ -1844,7 +1844,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)))
);
}
@@ -1860,7 +1860,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))))
);
}
@@ -1907,7 +1907,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))
);
}
@@ -1922,7 +1922,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))
);
}
@@ -1938,7 +1938,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)))
);
}
@@ -1985,7 +1985,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)))
);
}
@@ -2000,7 +2000,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)))
);
}
@@ -2016,7 +2016,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))))
);
}
@@ -2063,7 +2063,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))
);
}
@@ -2078,7 +2078,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))
);
}
@@ -2094,7 +2094,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)))
);
}
@@ -2141,7 +2141,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))
);
}
@@ -2156,7 +2156,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))
);
}
@@ -2172,7 +2172,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)))
);
}
@@ -2225,7 +2225,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 }))
);
}
@@ -2269,7 +2269,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"))
);
}
@@ -2313,7 +2313,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)))
);
}
@@ -2328,7 +2328,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)))
);
}
@@ -2344,7 +2344,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))))
);
}
@@ -2391,7 +2391,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))
);
}
@@ -2406,7 +2406,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))
);
}
@@ -2422,7 +2422,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)))
);
}
@@ -2469,7 +2469,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)))
);
}
@@ -2484,7 +2484,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)))
);
}
@@ -2500,7 +2500,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))))
);
}
@@ -2547,7 +2547,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))
);
}
@@ -2562,7 +2562,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))
);
}
@@ -2578,7 +2578,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)))
);
}
@@ -2625,7 +2625,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))
);
}
@@ -2640,7 +2640,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))
);
}
@@ -2656,7 +2656,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)))
);
}
@@ -2709,7 +2709,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 }))
);
}
@@ -2753,7 +2753,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"))
);
}
View Lorry Controller Status