[core, ios, macos] Refactor composite stop types and conversions

2017-02-07 12:35:27 -08:00
parent 9df24addfb
commit f35ca0d9df
13 changed files with 268 additions and 149 deletions
--- a/test/style/conversion/stringify.test.cpp
+++ b/test/style/conversion/stringify.test.cpp
@@ -101,9 +101,12 @@ TEST(Stringify, SourceFunction) {

 TEST(Stringify, CompositeFunction) {
    ASSERT_EQ(stringify(CompositeFunction<float>("property",
-        std::map<float, ExponentialStops<float>> {
-            { 0, ExponentialStops<float> { {{0, 1}}, 2 } },
-            { 1, ExponentialStops<float> { {{0, 1}}, 2 } }
+        CompositeExponentialStops<float> {
+            {
+                { 0, {{0, 1}} },
+                { 1, {{0, 1}} }
+            },
+            2
        }, 0.0f)),
        "{\"property\":\"property\",\"type\":\"exponential\",\"base\":2.0,"
        "\"stops\":["