[core] Implement image expression (#15877)
* [core] Bump gl-js version * [core] Implement image expression * [core] Use new image expression * [core] Coerce image expression to / from string * [core] Serialize evaluated image * [core] Pass available images to layout * [core] Pass images to evaluation context * [core] Set available flag value based on image availability * [core] Allow image coercion to boolean to indicate image availability * [core] Coalesce image expression * [core] Add image expression to next build system * [core] Align serialization format and evaluated type with gl-js * [core] Add images to expression evaluation method * [core] Add support for Image expression to expression test runner * [core] Unskip image expression tests * [core] Update unit tests * [core] Use image expression in annotation manager * [core] Add string to ImageExpression conversion * [core] Add image expression to expression dsl * [core] Convert tokens for implicitly created Image literal * [core] Fix clang format * [core] Split generated style code lines that are over 120 characters * [core] Add unit test for image expression equality * [core] Add image property expression evaluation unit test * [core] Unskip image expression render test * [core] Skip 'in' expression tests * [core] Ignore fill-pattern/update-feature-state render test * [core] Rename Image::serialize to Image::toValue
This commit is contained in:
@@ -14,21 +14,17 @@ using namespace mbgl::style::expression::dsl;
|
||||
|
||||
using namespace std::string_literals;
|
||||
|
||||
static StubGeometryTileFeature oneInteger {
|
||||
PropertyMap {{ "property", uint64_t(1) }}
|
||||
};
|
||||
static const StubGeometryTileFeature oneInteger{PropertyMap{{"property", uint64_t(1)}}};
|
||||
|
||||
static StubGeometryTileFeature oneDouble {
|
||||
PropertyMap {{ "property", 1.0 }}
|
||||
};
|
||||
static const StubGeometryTileFeature oneDouble{PropertyMap{{"property", 1.0}}};
|
||||
|
||||
static StubGeometryTileFeature oneString {
|
||||
PropertyMap {{ "property", "1"s }}
|
||||
};
|
||||
static const StubGeometryTileFeature oneString{PropertyMap{{"property", "1"s}}};
|
||||
|
||||
static StubGeometryTileFeature oneColor {
|
||||
PropertyMap {{ "color", "red"s }}
|
||||
};
|
||||
static const StubGeometryTileFeature oneColor{PropertyMap{{"color", "red"s}}};
|
||||
|
||||
static const StubGeometryTileFeature oneImage{PropertyMap{{"image_name", "maki-11"s}}};
|
||||
|
||||
static const StubGeometryTileFeature emptyTileFeature{PropertyMap{}};
|
||||
|
||||
float evaluate(PropertyValue<float> value, float zoom) {
|
||||
return value.evaluate(PropertyEvaluator<float>(PropertyEvaluationParameters(zoom), 0));
|
||||
@@ -171,3 +167,54 @@ TEST(PropertyExpression, FormatSectionOverride) {
|
||||
EXPECT_TRUE(*override1 != *override4);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(PropertyExpression, ImageExpression) {
|
||||
const std::set<std::string> emptySet;
|
||||
const std::set<std::string> availableImages = {"maki-11", "airport-11", "bicycle-15"};
|
||||
|
||||
// evaluation test without available images
|
||||
{
|
||||
PropertyExpression<expression::Image> propExpr(image(literal("airport-11")));
|
||||
auto evaluatedImage = propExpr.evaluate(emptyTileFeature, emptySet, expression::Image());
|
||||
EXPECT_FALSE(evaluatedImage.isAvailable());
|
||||
EXPECT_EQ(evaluatedImage.id(), "airport-11"s);
|
||||
|
||||
PropertyExpression<expression::Image> ddPropExpr(image(get(literal("image_name"s))));
|
||||
evaluatedImage = ddPropExpr.evaluate(oneImage, emptySet, expression::Image());
|
||||
EXPECT_FALSE(evaluatedImage.isAvailable());
|
||||
EXPECT_EQ(evaluatedImage.id(), "maki-11"s);
|
||||
|
||||
evaluatedImage = ddPropExpr.evaluate(emptyTileFeature, emptySet, expression::Image());
|
||||
EXPECT_FALSE(evaluatedImage.isAvailable());
|
||||
EXPECT_EQ(evaluatedImage.id(), ""s);
|
||||
}
|
||||
|
||||
// evaluation test with available images
|
||||
{
|
||||
PropertyExpression<expression::Image> propExpr(image(literal("airport-11")));
|
||||
auto evaluatedImage = propExpr.evaluate(emptyTileFeature, availableImages, expression::Image());
|
||||
EXPECT_TRUE(evaluatedImage.isAvailable());
|
||||
EXPECT_EQ(evaluatedImage.id(), "airport-11"s);
|
||||
|
||||
PropertyExpression<expression::Image> ddPropExpr(image(get(literal("image_name"s))));
|
||||
evaluatedImage = ddPropExpr.evaluate(oneImage, availableImages, expression::Image());
|
||||
EXPECT_TRUE(evaluatedImage.isAvailable());
|
||||
EXPECT_EQ(evaluatedImage.id(), "maki-11"s);
|
||||
|
||||
evaluatedImage = ddPropExpr.evaluate(emptyTileFeature, availableImages, expression::Image());
|
||||
EXPECT_FALSE(evaluatedImage.isAvailable());
|
||||
EXPECT_EQ(evaluatedImage.id(), ""s);
|
||||
}
|
||||
|
||||
// evaluation with zoom
|
||||
{
|
||||
auto expr = step(zoom(), image(literal("airport-11")), 18.0, image(literal("bicycle-15")));
|
||||
PropertyExpression<expression::Image> propExpr(std::move(expr));
|
||||
auto evaluatedImage = propExpr.evaluate(0.0, emptyTileFeature, availableImages, expression::Image());
|
||||
EXPECT_TRUE(evaluatedImage.isAvailable());
|
||||
EXPECT_EQ(evaluatedImage.id(), "airport-11"s);
|
||||
evaluatedImage = propExpr.evaluate(18.0, emptyTileFeature, availableImages, expression::Image());
|
||||
EXPECT_TRUE(evaluatedImage.isAvailable());
|
||||
EXPECT_EQ(evaluatedImage.id(), "bicycle-15"s);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user