tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Replace use of *Stops with expressions DSL

Browse Source
This commit is contained in:
John Firebaugh
2018-06-27 16:57:23 -07:00
parent 16a3f318a1
commit 542a4b4501
18 changed files with 438 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
test/style/function/source_function.test.cpp
View File

@@ -2,6 +2,7 @@
#include <mbgl/test/stub_geometry_tile_feature.hpp>
#include <mbgl/style/function/source_function.hpp>
#include <mbgl/style/expression/dsl.hpp>
using namespace mbgl;
using namespace mbgl::style;
@@ -20,78 +21,15 @@ static StubGeometryTileFeature oneString {
PropertyMap {{ "property", "1"s }}
};
static StubGeometryTileFeature red {
PropertyMap {{ "property", "red"s }}
};
TEST(SourceFunction, Defaults) {
using namespace mbgl::style::expression::dsl;
static StubGeometryTileFeature oneTwoInteger {
PropertyMap {{ "property", std::vector<Value>({uint64_t(1), uint64_t(2)}) }}
};
static StubGeometryTileFeature oneTwoDouble {
PropertyMap {{ "property", std::vector<Value>({1.0, 2.0}) }}
};
static StubGeometryTileFeature oneTwoString {
PropertyMap {{ "property", std::vector<Value>({"1"s, "2"s}) }}
};
static StubGeometryTileFeature trueFeature {
PropertyMap {{ "property", true }}
};
static StubGeometryTileFeature falseFeature {
PropertyMap {{ "property", false }}
};
TEST(SourceFunction, Identity) {
EXPECT_EQ(1.0f, SourceFunction<float>("property", IdentityStops<float>(), 0.0f)
EXPECT_EQ(1.0f, SourceFunction<float>(number(get("property")), 0.0)
.evaluate(oneInteger, 2.0f));
EXPECT_EQ(1.0f, SourceFunction<float>("property", IdentityStops<float>(), 0.0f)
EXPECT_EQ(1.0f, SourceFunction<float>(number(get("property")), 0.0)
.evaluate(oneDouble, 2.0f));
EXPECT_EQ(0.0f, SourceFunction<float>("property", IdentityStops<float>(), 0.0f)
EXPECT_EQ(0.0f, SourceFunction<float>(number(get("property")), 0.0)
.evaluate(oneString, 2.0f));
EXPECT_EQ(2.0f, SourceFunction<float>("property", IdentityStops<float>())
EXPECT_EQ(2.0f, SourceFunction<float>(number(get("property")))
.evaluate(oneString, 2.0f));
EXPECT_EQ(Color::red(), SourceFunction<Color>("property", IdentityStops<Color>(), Color::black())
.evaluate(red, Color::black()));
EXPECT_EQ(Color::black(), SourceFunction<Color>("property", IdentityStops<Color>(), Color::black())
.evaluate(oneInteger, Color::black()));
std::array<float, 2> zeroArray {{ 0, 0 }};
EXPECT_EQ((std::array<float, 2> {{ 1, 2 }}), (SourceFunction<std::array<float, 2>>("property", IdentityStops<std::array<float, 2>>(), zeroArray)
.evaluate(oneTwoInteger, zeroArray)));
EXPECT_EQ((std::array<float, 2> {{ 1, 2 }}), (SourceFunction<std::array<float, 2>>("property", IdentityStops<std::array<float, 2>>(), zeroArray)
.evaluate(oneTwoDouble, zeroArray)));
EXPECT_EQ((std::array<float, 2> {{ 0, 0 }}), (SourceFunction<std::array<float, 2>>("property", IdentityStops<std::array<float, 2>>(), zeroArray)
.evaluate(oneTwoString, zeroArray)));
}
TEST(SourceFunction, Categorical) {
EXPECT_EQ(1.0f, SourceFunction<float>("property", CategoricalStops<float>({{ int64_t(1), 1.0f }}))
.evaluate(oneInteger, 0.0f));
EXPECT_EQ(1.0f, SourceFunction<float>("property", CategoricalStops<float>({{ int64_t(1), 1.0f }}))
.evaluate(oneDouble, 0.0f));
EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>({{ int64_t(1), 1.0f }}))
.evaluate(oneString, 0.0f));
CategoricalStops<float>::Stops stops;
stops["1"s] = 1.0f;
EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>(stops))
.evaluate(oneInteger, 0.0f));
EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>(stops))
.evaluate(oneDouble, 0.0f));
EXPECT_EQ(1.0f, SourceFunction<float>("property", CategoricalStops<float>(stops))
.evaluate(oneString, 0.0f));
EXPECT_EQ(1.0f, SourceFunction<float>("property", CategoricalStops<float>({{ true, 1.0f }}))
.evaluate(trueFeature, 0.0f));
EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>({{ true, 1.0f }}))
.evaluate(falseFeature, 0.0f));
EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>({{ false, 1.0f }}))
.evaluate(trueFeature, 0.0f));
EXPECT_EQ(1.0f, SourceFunction<float>("property", CategoricalStops<float>({{ false, 1.0f }}))
.evaluate(falseFeature, 0.0f));
}