summaryrefslogtreecommitdiff
path: root/src/mbgl/style/expression/compound_expression.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-09-13 15:03:19 -0700
committerChris Loer <chris.loer@mapbox.com>2018-09-19 14:54:38 -0700
commit2e93a9ddcf1f97188250335d991fbd7a2cc283af (patch)
tree86289e08e361a90e38c35db12501ea9b056d832d /src/mbgl/style/expression/compound_expression.cpp
parent89b075f592271bc11d58ebb7f854c453e81e3cf1 (diff)
downloadqtlocation-mapboxgl-2e93a9ddcf1f97188250335d991fbd7a2cc283af.tar.gz
[core] For string-valued properties, do coercion rather than assertion
Diffstat (limited to 'src/mbgl/style/expression/compound_expression.cpp')
-rw-r--r--src/mbgl/style/expression/compound_expression.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp
index f5cbd7030b..fc47b2d78e 100644
--- a/src/mbgl/style/expression/compound_expression.cpp
+++ b/src/mbgl/style/expression/compound_expression.cpp
@@ -309,19 +309,6 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
define("typeof", [](const Value& v) -> Result<std::string> { return toString(typeOf(v)); });
- define("to-string", [](const Value& value) -> Result<std::string> {
- return toString(value);
- });
-
- define("to-boolean", [](const Value& v) -> Result<bool> {
- return v.match(
- [&] (double f) { return static_cast<bool>(f); },
- [&] (const std::string& s) { return s.length() > 0; },
- [&] (bool b) { return b; },
- [&] (const NullValue&) { return false; },
- [&] (const auto&) { return true; }
- );
- });
define("to-rgba", [](const Color& color) -> Result<std::array<double, 4>> {
return color.toArray();
});