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

Add clang-format (#1086)

Browse Source 
Co-authored-by: mwilsnd <mwilsnd@gmail.com>
This commit is contained in:
Bart Louwers
2023-05-01 16:57:37 +02:00
committed by GitHub
parent 403a12bd1b
commit 71f6da2722
1018 changed files with 27876 additions and 25862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
test/style/property_expression.test.cpp
View File

@@ -35,13 +35,11 @@ float evaluate(PropertyValue<float> value, float zoom) {
return value.evaluate(PropertyEvaluator<float>(PropertyEvaluationParameters(zoom), 0));
}
template<typename T>
template <typename T>
auto createOverride(expression::type::Type exprType,
PossiblyEvaluatedPropertyValue<T> propValue,
std::string propName) {
return std::make_unique<FormatSectionOverride<T>>(std::move(exprType),
std::move(propValue),
std::move(propName));
return std::make_unique<FormatSectionOverride<T>>(std::move(exprType), std::move(propValue), std::move(propName));
}
TEST(PropertyExpression, Constant) {
@@ -63,74 +61,96 @@ TEST(PropertyExpression, Expression) {
}
TEST(PropertyExpression, Defaults) {
EXPECT_EQ(1.0f, PropertyExpression<float>(number(get("property")), 0.0f)
.evaluate(oneInteger, 2.0f));
EXPECT_EQ(1.0f, PropertyExpression<float>(number(get("property")), 0.0f)
.evaluate(oneDouble, 2.0f));
EXPECT_EQ(0.0f, PropertyExpression<float>(number(get("property")), 0.0f)
.evaluate(oneString, 2.0f));
EXPECT_EQ(2.0f, PropertyExpression<float>(number(get("property")))
.evaluate(oneString, 2.0f));
EXPECT_EQ(1.0f, PropertyExpression<float>(number(get("property")), 0.0f).evaluate(oneInteger, 2.0f));
EXPECT_EQ(1.0f, PropertyExpression<float>(number(get("property")), 0.0f).evaluate(oneDouble, 2.0f));
EXPECT_EQ(0.0f, PropertyExpression<float>(number(get("property")), 0.0f).evaluate(oneString, 2.0f));
EXPECT_EQ(2.0f, PropertyExpression<float>(number(get("property"))).evaluate(oneString, 2.0f));
}
TEST(PropertyExpression, ZoomInterpolation) {
EXPECT_EQ(40.0f, PropertyExpression<float>(
interpolate(linear(), zoom(),
0.0, interpolate(linear(), number(get("property")), 1.0, literal(24.0)),
1.5, interpolate(linear(), number(get("property")), 1.0, literal(36.0)),
3.0, interpolate(linear(), number(get("property")), 1.0, literal(48.0))
), 0.0f)
.evaluate(2.0f, oneInteger, -1.0f)) << "Should interpolate between stops";
EXPECT_EQ(33.0, PropertyExpression<float>(
interpolate(linear(), zoom(),
5.0, interpolate(linear(), number(get("property")), 1.0, literal(33.0)),
10.0, interpolate(linear(), number(get("property")), 1.0, literal(66.0))
), 0.0f)
.evaluate(0.0f, oneInteger, -1.0f)) << "Use first stop output for input values from -inf to first stop";
EXPECT_EQ(66.0, PropertyExpression<float>(
interpolate(linear(), zoom(),
0.0, interpolate(linear(), number(get("property")), 1.0, literal(33.0)),
10.0, interpolate(linear(), number(get("property")), 1.0, literal(66.0))
), 0.0f)
.evaluate(20.0f, oneInteger, -1.0f)) << "Use last stop output for input values from last stop to +inf";
EXPECT_EQ(40.0f,
PropertyExpression<float>(interpolate(linear(),
zoom(),
0.0,
interpolate(linear(), number(get("property")), 1.0, literal(24.0)),
1.5,
interpolate(linear(), number(get("property")), 1.0, literal(36.0)),
3.0,
interpolate(linear(), number(get("property")), 1.0, literal(48.0))),
0.0f)
.evaluate(2.0f, oneInteger, -1.0f))
<< "Should interpolate between stops";
EXPECT_EQ(66.0f, PropertyExpression<float>(
interpolate(linear(), zoom(),
0.0, interpolate(linear(), number(get("property")), 1.0, literal(33.0)),
10.0, interpolate(linear(), number(get("property")), 1.0, literal(66.0))
), 0.0f)
.evaluate(10.0f, oneInteger, -1.0f)) << "Should interpolate TO the last stop.";
EXPECT_EQ(33.0f, PropertyExpression<float>(
interpolate(linear(), zoom(),
0.0, interpolate(linear(), number(get("property")), 1.0, literal(33.0)),
10.0, interpolate(linear(), number(get("property")), 1.0, literal(66.0))
), 0.0f)
.evaluate(0.0f, oneInteger, -1.0f)) << "Should interpolate TO the first stop";
EXPECT_EQ(33.0,
PropertyExpression<float>(interpolate(linear(),
zoom(),
5.0,
interpolate(linear(), number(get("property")), 1.0, literal(33.0)),
10.0,
interpolate(linear(), number(get("property")), 1.0, literal(66.0))),
0.0f)
.evaluate(0.0f, oneInteger, -1.0f))
<< "Use first stop output for input values from -inf to first stop";
EXPECT_EQ(66.0,
PropertyExpression<float>(interpolate(linear(),
zoom(),
0.0,
interpolate(linear(), number(get("property")), 1.0, literal(33.0)),
10.0,
interpolate(linear(), number(get("property")), 1.0, literal(66.0))),
0.0f)
.evaluate(20.0f, oneInteger, -1.0f))
<< "Use last stop output for input values from last stop to +inf";
EXPECT_EQ(66.0f,
PropertyExpression<float>(interpolate(linear(),
zoom(),
0.0,
interpolate(linear(), number(get("property")), 1.0, literal(33.0)),
10.0,
interpolate(linear(), number(get("property")), 1.0, literal(66.0))),
0.0f)
.evaluate(10.0f, oneInteger, -1.0f))
<< "Should interpolate TO the last stop.";
EXPECT_EQ(33.0f,
PropertyExpression<float>(interpolate(linear(),
zoom(),
0.0,
interpolate(linear(), number(get("property")), 1.0, literal(33.0)),
10.0,
interpolate(linear(), number(get("property")), 1.0, literal(66.0))),
0.0f)
.evaluate(0.0f, oneInteger, -1.0f))
<< "Should interpolate TO the first stop";
}
TEST(PropertyExpression, Issue8460) {
PropertyExpression<float> fn1(
interpolate(linear(), zoom(),
15.0, interpolate(linear(), number(get("property")), 1.0, literal(0.0)),
15.2, interpolate(linear(), number(get("property")), 1.0, literal(600.0))
), 0.0f);
PropertyExpression<float> fn1(interpolate(linear(),
zoom(),
15.0,
interpolate(linear(), number(get("property")), 1.0, literal(0.0)),
15.2,
interpolate(linear(), number(get("property")), 1.0, literal(600.0))),
0.0f);
EXPECT_NEAR( 0.0f, fn1.evaluate(15.0f, oneInteger, -1.0f), 0.00);
EXPECT_NEAR(0.0f, fn1.evaluate(15.0f, oneInteger, -1.0f), 0.00);
EXPECT_NEAR(300.0f, fn1.evaluate(15.1f, oneInteger, -1.0f), 0.01);
EXPECT_NEAR(600.0f, fn1.evaluate(15.2f, oneInteger, -1.0f), 0.00);
EXPECT_NEAR(600.0f, fn1.evaluate(16.0f, oneInteger, -1.0f), 0.00);
PropertyExpression<float> fn2(
interpolate(linear(), zoom(),
15.0, interpolate(linear(), number(get("property")), 1.0, literal(0.0)),
15.2, interpolate(linear(), number(get("property")), 1.0, literal(300.0)),
18.0, interpolate(linear(), number(get("property")), 1.0, literal(600.0))
), 0.0f);
PropertyExpression<float> fn2(interpolate(linear(),
zoom(),
15.0,
interpolate(linear(), number(get("property")), 1.0, literal(0.0)),
15.2,
interpolate(linear(), number(get("property")), 1.0, literal(300.0)),
18.0,
interpolate(linear(), number(get("property")), 1.0, literal(600.0))),
0.0f);
EXPECT_NEAR( 0.0f, fn2.evaluate(15.0f, oneInteger, -1.0f), 0.00);
EXPECT_NEAR(0.0f, fn2.evaluate(15.0f, oneInteger, -1.0f), 0.00);
EXPECT_NEAR(150.0f, fn2.evaluate(15.1f, oneInteger, -1.0f), 0.01);
EXPECT_NEAR(300.0f, fn2.evaluate(15.2f, oneInteger, -1.0f), 0.00);
EXPECT_NEAR(385.71f, fn2.evaluate(16.0f, oneInteger, -1.0f), 0.01);
@@ -140,8 +160,7 @@ TEST(PropertyExpression, Issue8460) {
TEST(PropertyExpression, FormatSectionOverride) {
using Value = expression::Value;
Value formattedSection =
std::unordered_map<std::string, Value>{ {"text-color", Value{Color::blue()}} };
Value formattedSection = std::unordered_map<std::string, Value>{{"text-color", Value{Color::blue()}}};
auto ctx = expression::EvaluationContext(&oneDouble).withFormattedSection(&formattedSection);
PossiblyEvaluatedPropertyValue<Color> constantValueRed(Color::red());
PossiblyEvaluatedPropertyValue<Color> constantValueGreen(Color::green());
@@ -268,8 +287,8 @@ TEST(PropertyExpression, WithinExpression) {
ASSERT_TRUE(expression);
PropertyExpression<bool> propExpr(std::move(expression));
// evaluation test with valid geojson source but FeatureType is not Point/LineString (currently only support
// FeatureType::Point and FeatureType::LineString)
// evaluation test with valid geojson source but FeatureType is not Point/LineString
// (currently only support FeatureType::Point and FeatureType::LineString)
{
// testPoly is inside polygon, but will return false
Polygon<double> testRing{{{-9.228515625, -17.560246503294888},
@@ -293,8 +312,8 @@ TEST(PropertyExpression, WithinExpression) {
auto geoLine1 = convertGeometry(testLine1, canonicalTileID);
StubGeometryTileFeature lineFeature1(FeatureType::LineString, geoLine1);
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&lineFeature0).withCanonicalTileID(&canonicalTileID));
auto evaluatedResult = propExpr.evaluate(
EvaluationContext(&lineFeature0).withCanonicalTileID(&canonicalTileID));
EXPECT_TRUE(evaluatedResult);
evaluatedResult = propExpr.evaluate(EvaluationContext(&lineFeature1).withCanonicalTileID(&canonicalTileID));
EXPECT_FALSE(evaluatedResult);
@@ -302,7 +321,7 @@ TEST(PropertyExpression, WithinExpression) {
// evaluation test with valid geojson source and valid point features
{
auto getPointFeature = [&canonicalTileID](const Point<double>& testPoint) -> StubGeometryTileFeature {
auto getPointFeature = [&canonicalTileID](const Point<double> &testPoint) -> StubGeometryTileFeature {
auto geoPoint = convertGeometry(testPoint, canonicalTileID);
StubGeometryTileFeature pointFeature(FeatureType::Point, geoPoint);
return pointFeature;
@@ -310,8 +329,8 @@ TEST(PropertyExpression, WithinExpression) {
// check `within` algorithm
auto pointFeature = getPointFeature(Point<double>(-10.72265625, -7.27529233637217));
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&pointFeature).withCanonicalTileID(&canonicalTileID));
auto evaluatedResult = propExpr.evaluate(
EvaluationContext(&pointFeature).withCanonicalTileID(&canonicalTileID));
EXPECT_FALSE(evaluatedResult);
pointFeature = getPointFeature(Point<double>(-7.646484374999999, -12.382928338487396));
@@ -418,8 +437,8 @@ TEST(PropertyExpression, WithinExpressionAntiMeridian) {
auto geoLine1 = convertGeometry(testLine1, canonicalTileID);
StubGeometryTileFeature lineFeature1(FeatureType::LineString, geoLine1);
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&lineFeature0).withCanonicalTileID(&canonicalTileID));
auto evaluatedResult = propExpr.evaluate(
EvaluationContext(&lineFeature0).withCanonicalTileID(&canonicalTileID));
EXPECT_TRUE(evaluatedResult);
evaluatedResult = propExpr.evaluate(EvaluationContext(&lineFeature1).withCanonicalTileID(&canonicalTileID));
EXPECT_FALSE(evaluatedResult);
@@ -439,7 +458,7 @@ TEST(PropertyExpression, WithinExpressionAntiMeridian) {
ASSERT_TRUE(expression);
PropertyExpression<bool> propExpr(std::move(expression));
auto getPointFeature = [&canonicalTileID](const Point<double>& testPoint) -> StubGeometryTileFeature {
auto getPointFeature = [&canonicalTileID](const Point<double> &testPoint) -> StubGeometryTileFeature {
auto geoPoint = convertGeometry(testPoint, canonicalTileID);
StubGeometryTileFeature pointFeature(FeatureType::Point, geoPoint);
return pointFeature;
@@ -447,8 +466,8 @@ TEST(PropertyExpression, WithinExpressionAntiMeridian) {
// check `within` algorithm
auto pointFeature = getPointFeature(Point<double>(177, 62.5));
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&pointFeature).withCanonicalTileID(&canonicalTileID));
auto evaluatedResult = propExpr.evaluate(
EvaluationContext(&pointFeature).withCanonicalTileID(&canonicalTileID));
EXPECT_TRUE(evaluatedResult);
pointFeature = getPointFeature(Point<double>(180, 62.5));
@@ -517,10 +536,9 @@ TEST(PropertyExpression, DistanceExpression) {
ASSERT_TRUE(expression);
PropertyExpression<double> propExpr(std::move(expression));
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&pointFeature).withCanonicalTileID(&canonicalTileID), invalidResult);
auto evaluatedResult = propExpr.evaluate(EvaluationContext(&pointFeature).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(491.307, evaluatedResult, 0.01);
}
// Evaluation test with Point to MultiPoint distance
@@ -544,8 +562,8 @@ TEST(PropertyExpression, DistanceExpression) {
auto geoPoint = convertGeometry(featurePoint, canonicalTileID);
StubGeometryTileFeature feature(FeatureType::Point, geoPoint);
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&feature).withCanonicalTileID(&canonicalTileID), invalidResult);
auto evaluatedResult = propExpr.evaluate(EvaluationContext(&feature).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(158.541, evaluatedResult, 0.01);
}
@@ -571,8 +589,8 @@ TEST(PropertyExpression, DistanceExpression) {
auto geoLine = convertGeometry(line, canonicalTileID);
StubGeometryTileFeature lineFeature(FeatureType::LineString, geoLine);
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&lineFeature).withCanonicalTileID(&canonicalTileID), invalidResult);
auto evaluatedResult = propExpr.evaluate(EvaluationContext(&lineFeature).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(107.211, evaluatedResult, 0.01);
}
@@ -600,8 +618,8 @@ TEST(PropertyExpression, DistanceExpression) {
auto geoLine = convertGeometry(lines, canonicalTileID);
StubGeometryTileFeature lineFeature(FeatureType::LineString, geoLine);
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&lineFeature).withCanonicalTileID(&canonicalTileID), invalidResult);
auto evaluatedResult = propExpr.evaluate(EvaluationContext(&lineFeature).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(59.845, evaluatedResult, 0.01);
}
@@ -671,16 +689,16 @@ TEST(PropertyExpression, DistanceExpression) {
ASSERT_TRUE(expression);
PropertyExpression<double> propExpr(std::move(expression));
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&lineFeature).withCanonicalTileID(&canonicalTileID), invalidResult);
auto evaluatedResult = propExpr.evaluate(EvaluationContext(&lineFeature).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(180.408, evaluatedResult, 0.01);
}
// Evaluation test with MultiPoints to MutltiLineString distance
{
const auto multiPoints = mbgl::util::read_file("test/fixtures/geometry_data/multi_point_2.geojson");
const auto multiLineFeature =
getFeature("multi_line_string_1.geojson", FeatureType::LineString, canonicalTileID);
const auto multiLineFeature = getFeature(
"multi_line_string_1.geojson", FeatureType::LineString, canonicalTileID);
std::stringstream ss;
ss << std::string(R"(["distance", )") << multiPoints << std::string(R"( ])");
auto expression = createExpression(ss.str().c_str());
@@ -695,8 +713,8 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with LineString to MutltiLineString distance
{
const auto LineString1 = mbgl::util::read_file("test/fixtures/geometry_data/line_string_1.geojson");
const auto multiLineFeature =
getFeature("multi_line_string_2.geojson", FeatureType::LineString, canonicalTileID);
const auto multiLineFeature = getFeature(
"multi_line_string_2.geojson", FeatureType::LineString, canonicalTileID);
std::stringstream ss;
ss << std::string(R"(["distance", )") << LineString1 << std::string(R"( ])");
auto expression = createExpression(ss.str().c_str());
@@ -711,8 +729,8 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with MultiLineString to MutltiLineString distance
{
const auto multiLineString1 = mbgl::util::read_file("test/fixtures/geometry_data/multi_line_string_1.geojson");
const auto multiLineFeature =
getFeature("multi_line_string_2.geojson", FeatureType::LineString, canonicalTileID);
const auto multiLineFeature = getFeature(
"multi_line_string_2.geojson", FeatureType::LineString, canonicalTileID);
std::stringstream ss;
ss << std::string(R"(["distance", )") << multiLineString1 << std::string(R"( ])");
auto expression = createExpression(ss.str().c_str());
@@ -753,14 +771,14 @@ TEST(PropertyExpression, DistanceExpression) {
ASSERT_TRUE(expression);
PropertyExpression<double> propExpr(std::move(expression));
const auto multiLineFeature1 =
getFeature("multi_line_string_1.geojson", FeatureType::LineString, canonicalTileID);
const auto multiLineFeature1 = getFeature(
"multi_line_string_1.geojson", FeatureType::LineString, canonicalTileID);
auto evaluatedResult = propExpr.evaluate(
EvaluationContext(&multiLineFeature1).withCanonicalTileID(&canonicalTileID), invalidResult);
EXPECT_NEAR(193.450, evaluatedResult, 0.01);
const auto multiLineFeature2 =
getFeature("multi_line_string_2.geojson", FeatureType::LineString, canonicalTileID);
const auto multiLineFeature2 = getFeature(
"multi_line_string_2.geojson", FeatureType::LineString, canonicalTileID);
evaluatedResult = propExpr.evaluate(EvaluationContext(&multiLineFeature2).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(0.0, evaluatedResult, 0.01);
@@ -783,8 +801,8 @@ TEST(PropertyExpression, DistanceExpression) {
auto geoPolygon = convertGeometry(polygon, canonicalTileID);
StubGeometryTileFeature polygonFeature(FeatureType::Polygon, geoPolygon);
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&polygonFeature).withCanonicalTileID(&canonicalTileID), invalidResult);
auto evaluatedResult = propExpr.evaluate(
EvaluationContext(&polygonFeature).withCanonicalTileID(&canonicalTileID), invalidResult);
EXPECT_NEAR(203.876, evaluatedResult, 0.01);
}
@@ -827,8 +845,8 @@ TEST(PropertyExpression, DistanceExpression) {
auto geoPolygon1 = convertGeometry(polygon1, canonicalTileID);
StubGeometryTileFeature polygonFeature1(FeatureType::Polygon, geoPolygon1);
auto evaluatedResult =
propExpr.evaluate(EvaluationContext(&polygonFeature1).withCanonicalTileID(&canonicalTileID), invalidResult);
auto evaluatedResult = propExpr.evaluate(
EvaluationContext(&polygonFeature1).withCanonicalTileID(&canonicalTileID), invalidResult);
EXPECT_NEAR(0.0, evaluatedResult, 0.01);
// polygon2's line is intersecting polygon, but no point is inside polygon
@@ -840,8 +858,8 @@ TEST(PropertyExpression, DistanceExpression) {
auto geoPolygon2 = convertGeometry(polygon2, canonicalTileID);
StubGeometryTileFeature polygonFeature2(FeatureType::Polygon, geoPolygon2);
evaluatedResult =
propExpr.evaluate(EvaluationContext(&polygonFeature2).withCanonicalTileID(&canonicalTileID), invalidResult);
evaluatedResult = propExpr.evaluate(EvaluationContext(&polygonFeature2).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(0.0, evaluatedResult, 0.01);
// one of polygon3's point is inside polygon
@@ -853,8 +871,8 @@ TEST(PropertyExpression, DistanceExpression) {
auto geoPolygon3 = convertGeometry(polygon3, canonicalTileID);
StubGeometryTileFeature polygonFeature3(FeatureType::Polygon, geoPolygon3);
evaluatedResult =
propExpr.evaluate(EvaluationContext(&polygonFeature3).withCanonicalTileID(&canonicalTileID), invalidResult);
evaluatedResult = propExpr.evaluate(EvaluationContext(&polygonFeature3).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(0.0, evaluatedResult, 0.01);
// lineString1 is within polygon
@@ -862,8 +880,8 @@ TEST(PropertyExpression, DistanceExpression) {
auto geoLineString1 = convertGeometry(lineString1, canonicalTileID);
StubGeometryTileFeature lineFeature1(FeatureType::LineString, geoLineString1);
evaluatedResult =
propExpr.evaluate(EvaluationContext(&lineFeature1).withCanonicalTileID(&canonicalTileID), invalidResult);
evaluatedResult = propExpr.evaluate(EvaluationContext(&lineFeature1).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(0.0, evaluatedResult, 0.01);
// lineString2 is intersecting the polygon but its points are outside the polygon
@@ -871,8 +889,8 @@ TEST(PropertyExpression, DistanceExpression) {
auto geoLineString2 = convertGeometry(lineString2, canonicalTileID);
StubGeometryTileFeature lineFeature2(FeatureType::LineString, geoLineString2);
evaluatedResult =
propExpr.evaluate(EvaluationContext(&lineFeature2).withCanonicalTileID(&canonicalTileID), invalidResult);
evaluatedResult = propExpr.evaluate(EvaluationContext(&lineFeature2).withCanonicalTileID(&canonicalTileID),
invalidResult);
EXPECT_NEAR(0.0, evaluatedResult, 0.01);
}
}