c6f3cc8b60
* [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
53 lines
2.0 KiB
C++
53 lines
2.0 KiB
C++
#pragma once
|
|
|
|
#include <mbgl/style/property_value.hpp>
|
|
#include <mbgl/style/conversion/constant.hpp>
|
|
#include <mbgl/style/conversion/function.hpp>
|
|
#include <mbgl/style/conversion.hpp>
|
|
#include <mbgl/style/expression/value.hpp>
|
|
#include <mbgl/style/expression/is_constant.hpp>
|
|
#include <mbgl/style/expression/is_expression.hpp>
|
|
#include <mbgl/style/expression/parsing_context.hpp>
|
|
#include <mbgl/style/expression/literal.hpp>
|
|
|
|
namespace mbgl {
|
|
namespace style {
|
|
namespace conversion {
|
|
|
|
template <class T>
|
|
struct Converter<PropertyValue<T>> {
|
|
optional<PropertyValue<T>> operator()(const Convertible& value, Error& error, bool allowDataExpressions, bool convertTokens) const;
|
|
|
|
template <class S>
|
|
PropertyValue<T> maybeConvertTokens(const S& t) const {
|
|
return PropertyValue<T>(t);
|
|
};
|
|
|
|
PropertyValue<T> maybeConvertTokens(const std::string& t) const {
|
|
return hasTokens(t)
|
|
? PropertyValue<T>(PropertyExpression<T>(convertTokenStringToExpression(t)))
|
|
: PropertyValue<T>(t);
|
|
}
|
|
|
|
PropertyValue<T> maybeConvertTokens(const expression::Formatted& t) const {
|
|
// This only works with a single-section `Formatted` created automatically
|
|
// by parsing a plain-text `text-field` property.
|
|
// Token conversion happens later than the initial string->Formatted conversion
|
|
// General purpose `format` expressions with embedded tokens are not supported
|
|
const std::string& firstUnformattedSection = t.sections[0].text;
|
|
return hasTokens(firstUnformattedSection)
|
|
? PropertyValue<T>(PropertyExpression<T>(convertTokenStringToFormatExpression(firstUnformattedSection)))
|
|
: PropertyValue<T>(t);
|
|
}
|
|
|
|
PropertyValue<T> maybeConvertTokens(const expression::Image& image) const {
|
|
return hasTokens(image.id())
|
|
? PropertyValue<T>(PropertyExpression<T>(convertTokenStringToImageExpression(image.id())))
|
|
: PropertyValue<T>(image);
|
|
}
|
|
};
|
|
|
|
} // namespace conversion
|
|
} // namespace style
|
|
} // namespace mbgl
|