summaryrefslogtreecommitdiff
path: root/src/mbgl/style/expression/value.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-09-13 14:27:57 -0700
committerChris Loer <chris.loer@mapbox.com>2018-09-19 14:54:38 -0700
commit89b075f592271bc11d58ebb7f854c453e81e3cf1 (patch)
tree52a10397008d073a60e6c0524ee42f971b3a954c /src/mbgl/style/expression/value.cpp
parenta991eec597541c32682946b541e22ccad0f98dd1 (diff)
downloadqtlocation-mapboxgl-89b075f592271bc11d58ebb7f854c453e81e3cf1.tar.gz
[core] Auto-convert concat arguments to strings
Diffstat (limited to 'src/mbgl/style/expression/value.cpp')
-rw-r--r--src/mbgl/style/expression/value.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/mbgl/style/expression/value.cpp b/src/mbgl/style/expression/value.cpp
index f089c918cd..4bac8116c2 100644
--- a/src/mbgl/style/expression/value.cpp
+++ b/src/mbgl/style/expression/value.cpp
@@ -34,6 +34,15 @@ type::Type typeOf(const Value& value) {
);
}
+std::string toString(const Value& value) {
+ return value.match(
+ [](const NullValue&) { return std::string(); },
+ [](const Color& c) { return c.stringify(); }, // avoid quoting
+ [](const std::string& s) { return s; }, // avoid quoting
+ [](const auto& v_) { return stringify(v_); }
+ );
+}
+
void writeJSON(rapidjson::Writer<rapidjson::StringBuffer>& writer, const Value& value) {
value.match(
[&] (const NullValue&) { writer.Null(); },