From 68f595a32bc746d958490c91aa7e165048491c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Thu, 17 Jul 2014 14:32:35 -0700 Subject: consolidate functions to only use stops refs mapbox/mapbox-gl-style-spec#96 --- test/fixtures/styles/road-width.style.json | 1 - test/functions.cpp | 44 ++++++++---------------------- 2 files changed, 12 insertions(+), 33 deletions(-) (limited to 'test') diff --git a/test/fixtures/styles/road-width.style.json b/test/fixtures/styles/road-width.style.json index 5738546b33..76d7b5258c 100644 --- a/test/fixtures/styles/road-width.style.json +++ b/test/fixtures/styles/road-width.style.json @@ -23,7 +23,6 @@ "type": "line", "style": { "line-width": { - "fn": "stops", "stops": [[13, 0], [13.999, 0], [14, 4], [14.1, 10], [14.2, 20]] } } diff --git a/test/functions.cpp b/test/functions.cpp index a2ad93c4e1..56b2a31706 100644 --- a/test/functions.cpp +++ b/test/functions.cpp @@ -19,11 +19,11 @@ TEST(Function, Constant) { TEST(Function, Stops) { // Explicit constant slope in fringe regions. - mbgl::StopsFunction slope_1({ { 0, 1.5 }, { 6, 1.5 }, { 8, 3 }, { 22, 3 } }); + mbgl::StopsFunction slope_1({ { 0, 1.5 }, { 6, 1.5 }, { 8, 3 }, { 22, 3 } }, 1.75); EXPECT_EQ(1.5, slope_1.evaluate(0)); EXPECT_EQ(1.5, slope_1.evaluate(4)); EXPECT_EQ(1.5, slope_1.evaluate(6)); - ASSERT_FLOAT_EQ(2.12132, slope_1.evaluate(7)); + ASSERT_FLOAT_EQ(2.0454545454545454, slope_1.evaluate(7)); EXPECT_EQ(3.0, slope_1.evaluate(8)); EXPECT_EQ(3.0, slope_1.evaluate(9)); EXPECT_EQ(3.0, slope_1.evaluate(15)); @@ -31,48 +31,28 @@ TEST(Function, Stops) { // Test constant values in fringe regions. - mbgl::StopsFunction slope_2({ { 6, 1.5 }, { 8, 3 } }); + mbgl::StopsFunction slope_2({ { 6, 1.5 }, { 8, 3 } }, 1.75); EXPECT_EQ(1.5, slope_2.evaluate(0)); EXPECT_EQ(1.5, slope_2.evaluate(4)); EXPECT_EQ(1.5, slope_2.evaluate(6)); - ASSERT_FLOAT_EQ(2.12132, slope_2.evaluate(7)); + ASSERT_FLOAT_EQ(2.0454545454545454, slope_2.evaluate(7)); EXPECT_EQ(3.0, slope_2.evaluate(8)); EXPECT_EQ(3.0, slope_2.evaluate(9)); EXPECT_EQ(3.0, slope_2.evaluate(15)); EXPECT_EQ(3.0, slope_2.evaluate(22)); // Test no values. - mbgl::StopsFunction slope_3({}); + mbgl::StopsFunction slope_3({}, 1.75); EXPECT_EQ(1, slope_3.evaluate(2)); EXPECT_EQ(1, slope_3.evaluate(6)); EXPECT_EQ(1, slope_3.evaluate(12)); -} - - -TEST(Function, Linear) { - mbgl::LinearFunction slope_1(/* val */ 7.5, /* z_base */ 4, /* slope */ 2, /* min */ 7.5, /* max */ 20); - ASSERT_FLOAT_EQ(7.5, slope_1.evaluate(3)); - ASSERT_FLOAT_EQ(7.5, slope_1.evaluate(4)); - ASSERT_FLOAT_EQ(8.5, slope_1.evaluate(4.5)); - ASSERT_FLOAT_EQ(9.5, slope_1.evaluate(5)); - ASSERT_FLOAT_EQ(11.5, slope_1.evaluate(6)); - ASSERT_FLOAT_EQ(19.5, slope_1.evaluate(10)); - ASSERT_FLOAT_EQ(20, slope_1.evaluate(11)); - ASSERT_FLOAT_EQ(20, slope_1.evaluate(20)); -} -TEST(Function, Exponential) { - mbgl::ExponentialFunction slope_1(/* val */ 7.5, /* z_base */ 4, /* exp_base */ 1.75, /* slope */ 2, /* min */ 7.5, /* max */ 20); - ASSERT_FLOAT_EQ(8.6428576, slope_1.evaluate(3)); // 7.5 + 1.75^(3 - 4) * 2 - ASSERT_FLOAT_EQ(9.5, slope_1.evaluate(4)); // 7.5 + 1.75^(4 - 4) * 2 - ASSERT_FLOAT_EQ(10.145751, slope_1.evaluate(4.5)); // 7.5 + 1.75^(4.5 - 4) * 2 - ASSERT_FLOAT_EQ(11, slope_1.evaluate(5)); // 7.5 + 1.75^(5 - 4) * 2 - ASSERT_FLOAT_EQ(13.625, slope_1.evaluate(6)); // 7.5 + 1.75^(6 - 4) * 2 - ASSERT_FLOAT_EQ(18.21875, slope_1.evaluate(7)); // 7.5 + 1.75^(7 - 4) * 2 - ASSERT_FLOAT_EQ(20, slope_1.evaluate(8)); // 7.5 + 1.75^(8 - 4) * 2 ==> clamped to 20 - ASSERT_FLOAT_EQ(20, slope_1.evaluate(20)); // 7.5 + 1.75^(20 - 4) * 2 ==> clamped to 20 + // Explicit constant slope in fringe regions. + mbgl::StopsFunction slope_4({ { 0, 2 }, { 8, 10 } }, 1); + EXPECT_EQ(2, slope_4.evaluate(0)); + EXPECT_EQ(3, slope_4.evaluate(1)); + EXPECT_EQ(4, slope_4.evaluate(2)); + EXPECT_EQ(4.75, slope_4.evaluate(2.75)); + EXPECT_EQ(10, slope_4.evaluate(8)); } - - - -- cgit v1.2.1