[core] Replace use of *Stops with expressions DSL

1 files changed, 32 insertions, 20 deletions

diff --git a/test/programs/symbol_program.test.cpp b/test/programs/symbol_program.test.cpp
index 62a2e58d7b..ed709a4ba7 100644
--- a/test/programs/symbol_program.test.cpp
+++ b/test/programs/symbol_program.test.cpp
@@ -1,8 +1,10 @@
 #include <mbgl/test/util.hpp>
 
 #include <mbgl/programs/symbol_program.hpp>
+#include <mbgl/style/expression/dsl.hpp>
 
 using namespace mbgl;
+using namespace mbgl::style::expression::dsl;
 
 TEST(SymbolProgram, SymbolSizeBinder) {
     auto binder = SymbolSizeBinder::create(5.0f, 12.0f, 0.0f);
@@ -11,45 +13,55 @@ TEST(SymbolProgram, SymbolSizeBinder) {
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
     EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 12.0f);
 
-    binder = SymbolSizeBinder::create(1.0f, style::CameraFunction<float>(style::ExponentialStops<float>({
-        {0.0f, 8.0f},
-        {10.0f, 18.0f}
-    }, 1.0f)), 0.0f);
+    binder = SymbolSizeBinder::create(1.0f, style::CameraFunction<float>(
+        interpolate(
+            linear(),
+            zoom(),
+            0., literal(8.),
+            10., literal(18.))), 0.0f);
     uniformValues = binder->uniformValues(1.5f);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
     EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 9.5f);
     
-    binder = SymbolSizeBinder::create(0.0f, style::CameraFunction<float>(style::ExponentialStops<float>({
-        {1.0f, 8.0f},
-        {11.0f, 18.0f}
-    }, 1.0f)), 0.0f);
+    binder = SymbolSizeBinder::create(0.0f, style::CameraFunction<float>(
+        interpolate(
+            linear(),
+            zoom(),
+            1., literal(8.),
+            11., literal(18.))), 0.0f);
     uniformValues = binder->uniformValues(0.5f);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
     EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 8.0f);
     
-    binder = SymbolSizeBinder::create(12.0f, style::CameraFunction<float>(style::ExponentialStops<float>({
-        {1.0f, 8.0f},
-        {11.0f, 18.0f}
-    }, 1.0f)), 0.0f);
+    binder = SymbolSizeBinder::create(12.0f, style::CameraFunction<float>(
+        interpolate(
+            linear(),
+            zoom(),
+            1., literal(8.),
+            11., literal(18.))), 0.0f);
     uniformValues = binder->uniformValues(12.5f);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
     EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 18.0f);
     
-    binder = SymbolSizeBinder::create(0.0f, style::SourceFunction<float>("x", style::ExponentialStops<float>({
-        {1.0f, 8.0f},
-        {11.0f, 18.0f}
-    }, 1.0f)), 0.0f);
+    binder = SymbolSizeBinder::create(0.0f, style::SourceFunction<float>(
+        interpolate(
+            linear(),
+            number(get("x")),
+            1., literal(8.),
+            11., literal(18.))), 0.0f);
     uniformValues = binder->uniformValues(12.5f);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, true);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, false);
 
-    binder = SymbolSizeBinder::create(5.0f, style::CompositeFunction<float>("x", style::CompositeExponentialStops<float>({
-        {1.0f, {{0.0f, 8.0f}, {100.0f, 18.0f}}},
-        {11.0f, {{0.0f, 12.0f}, {100.0f, 24.9f}}}
-    }, 1.0f)), 0.0f);
+    binder = SymbolSizeBinder::create(5.0f, style::CompositeFunction<float>(
+        interpolate(
+            linear(),
+            zoom(),
+            1., interpolate(linear(), number(get("x")), 0., literal(8.), 100., literal(18.)),
+            11., interpolate(linear(), number(get("x")), 0., literal(12.), 100., literal(24.9)))), 0.0f);
     uniformValues = binder->uniformValues(5.5f);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
     EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, false);