* [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
153 lines
4.6 KiB
C++
153 lines
4.6 KiB
C++
#pragma once
|
|
|
|
#include <mbgl/style/expression/collator.hpp>
|
|
#include <mbgl/style/expression/formatted.hpp>
|
|
#include <mbgl/style/expression/image.hpp>
|
|
#include <mbgl/style/expression/type.hpp>
|
|
#include <mbgl/style/position.hpp>
|
|
#include <mbgl/style/types.hpp>
|
|
#include <mbgl/util/color.hpp>
|
|
#include <mbgl/util/enum.hpp>
|
|
#include <mbgl/util/feature.hpp>
|
|
#include <mbgl/util/variant.hpp>
|
|
|
|
#include <array>
|
|
#include <vector>
|
|
|
|
namespace mbgl {
|
|
namespace style {
|
|
namespace expression {
|
|
|
|
struct Value;
|
|
|
|
using ValueBase = variant<NullValue,
|
|
bool,
|
|
double,
|
|
std::string,
|
|
Color,
|
|
Collator,
|
|
Formatted,
|
|
Image,
|
|
mapbox::util::recursive_wrapper<std::vector<Value>>,
|
|
mapbox::util::recursive_wrapper<std::unordered_map<std::string, Value>>>;
|
|
struct Value : ValueBase {
|
|
using ValueBase::ValueBase;
|
|
|
|
// Javascript's Number.MAX_SAFE_INTEGER
|
|
static uint64_t maxSafeInteger() { return 9007199254740991ULL; }
|
|
|
|
static bool isSafeInteger(uint64_t x) { return x <= maxSafeInteger(); };
|
|
static bool isSafeInteger(int64_t x) {
|
|
return static_cast<uint64_t>(x > 0 ? x : -x) <= maxSafeInteger();
|
|
}
|
|
static bool isSafeInteger(double x) {
|
|
return static_cast<uint64_t>(x > 0 ? x : -x) <= maxSafeInteger();
|
|
}
|
|
|
|
};
|
|
|
|
constexpr NullValue Null = NullValue();
|
|
|
|
type::Type typeOf(const Value& value);
|
|
|
|
std::string toString(const Value& value);
|
|
std::string stringify(const Value& value);
|
|
|
|
/*
|
|
Returns a Type object representing the expression type that corresponds to
|
|
the value type T. (Specialized for primitives and specific array types in
|
|
the .cpp.)
|
|
*/
|
|
template <typename T>
|
|
type::Type valueTypeToExpressionType();
|
|
|
|
/*
|
|
Conversions between style value types and expression::Value
|
|
*/
|
|
|
|
template <class T, class Enable = void>
|
|
struct ValueConverter {
|
|
static Value toExpressionValue(const T& value) {
|
|
return Value(value);
|
|
}
|
|
|
|
static optional<T> fromExpressionValue(const Value& value) {
|
|
return value.template is<T>() ? value.template get<T>() : optional<T>();
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct ValueConverter<Value> {
|
|
static type::Type expressionType() { return type::Value; }
|
|
static Value toExpressionValue(const Value& value) { return value; }
|
|
static optional<Value> fromExpressionValue(const Value& value) { return value; }
|
|
};
|
|
|
|
template <>
|
|
struct ValueConverter<mbgl::Value> {
|
|
static Value toExpressionValue(const mbgl::Value& value);
|
|
static mbgl::Value fromExpressionValue(const Value& value);
|
|
};
|
|
|
|
template <>
|
|
struct ValueConverter<float> {
|
|
static type::Type expressionType() { return type::Number; }
|
|
static Value toExpressionValue(const float value);
|
|
static optional<float> fromExpressionValue(const Value& value);
|
|
};
|
|
|
|
template <typename T, std::size_t N>
|
|
struct ValueConverter<std::array<T, N>> {
|
|
static type::Type expressionType() {
|
|
return type::Array(valueTypeToExpressionType<T>(), N);
|
|
}
|
|
static Value toExpressionValue(const std::array<T, N>& value);
|
|
static optional<std::array<T, N>> fromExpressionValue(const Value& value);
|
|
};
|
|
|
|
template <typename T>
|
|
struct ValueConverter<std::vector<T>> {
|
|
static type::Type expressionType() {
|
|
return type::Array(valueTypeToExpressionType<T>());
|
|
}
|
|
static Value toExpressionValue(const std::vector<T>& value);
|
|
static optional<std::vector<T>> fromExpressionValue(const Value& value);
|
|
};
|
|
|
|
template <>
|
|
struct ValueConverter<Position> {
|
|
static type::Type expressionType() { return type::Array(type::Number, 3); }
|
|
static Value toExpressionValue(const mbgl::style::Position& value);
|
|
static optional<Position> fromExpressionValue(const Value& v);
|
|
};
|
|
|
|
template <typename T>
|
|
struct ValueConverter<T, std::enable_if_t< std::is_enum<T>::value >> {
|
|
static type::Type expressionType() { return type::String; }
|
|
static Value toExpressionValue(const T& value);
|
|
static optional<T> fromExpressionValue(const Value& value);
|
|
};
|
|
|
|
template <typename T>
|
|
Value toExpressionValue(const T& value) {
|
|
return ValueConverter<T>::toExpressionValue(value);
|
|
}
|
|
|
|
template <typename T>
|
|
optional<T> fromExpressionValue(const Value& value) {
|
|
return ValueConverter<T>::fromExpressionValue(value);
|
|
}
|
|
|
|
template <typename T>
|
|
std::vector<optional<T>> fromExpressionValues(const std::vector<optional<Value>>& values) {
|
|
std::vector<optional<T>> result;
|
|
for (const auto& value : values) {
|
|
result.push_back(value ? fromExpressionValue<T>(*value) : nullopt);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
} // namespace expression
|
|
} // namespace style
|
|
} // namespace mbgl
|