diff options
Diffstat (limited to 'expression-test/expression_test_parser.cpp')
| -rw-r--r-- | expression-test/expression_test_parser.cpp | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/expression-test/expression_test_parser.cpp b/expression-test/expression_test_parser.cpp index 3c194ffee0..3b40eeb3b0 100644 --- a/expression-test/expression_test_parser.cpp +++ b/expression-test/expression_test_parser.cpp @@ -104,7 +104,8 @@ optional<Value> toValue(const JSValue& jsvalue) { style::expression::type::Type stringToType(const std::string& type) { using namespace style::expression; - if (type == "string"s || type == "number-format"s) { + if (type == "string"s || type == "number-format"s || + type == "image"s) { // TODO: replace once we implement image expressions return type::String; } else if (type == "number"s) { return type::Number; @@ -439,33 +440,7 @@ optional<Value> toValue(const expression::Value& exprValue) { std::vector<Value> color { double(c.r), double(c.g), double(c.b), double(c.a) }; return {Value{std::move(color)}}; }, - [](const expression::Formatted& formatted) -> optional<Value> { - std::unordered_map<std::string, Value> serialized; - std::vector<Value> sections; - for (const auto& section : formatted.sections) { - std::unordered_map<std::string, Value> serializedSection; - serializedSection.emplace("text", section.text); - if (section.fontScale) { - serializedSection.emplace("scale", *section.fontScale); - } else { - serializedSection.emplace("scale", NullValue()); - } - if (section.fontStack) { - std::string fontStackString; - serializedSection.emplace("fontStack", fontStackToString(*section.fontStack)); - } else { - serializedSection.emplace("fontStack", NullValue()); - } - if (section.textColor) { - serializedSection.emplace("textColor", section.textColor->toObject()); - } else { - serializedSection.emplace("textColor", NullValue()); - } - sections.emplace_back(serializedSection); - } - serialized.emplace("sections", sections); - return {Value{std::move(serialized)}}; - }, + [](const expression::Formatted& formatted) -> optional<Value> { return {formatted.toObject()}; }, [](const std::vector<expression::Value>& values) -> optional<Value> { std::vector<Value> mbglValues; for (const auto& value : values) { |