diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-09-13 15:03:19 -0700 |
---|---|---|
committer | Chris Loer <chris.loer@mapbox.com> | 2018-09-19 14:54:38 -0700 |
commit | 2e93a9ddcf1f97188250335d991fbd7a2cc283af (patch) | |
tree | 86289e08e361a90e38c35db12501ea9b056d832d /src/mbgl/style/conversion | |
parent | 89b075f592271bc11d58ebb7f854c453e81e3cf1 (diff) | |
download | qtlocation-mapboxgl-2e93a9ddcf1f97188250335d991fbd7a2cc283af.tar.gz |
[core] For string-valued properties, do coercion rather than assertion
Diffstat (limited to 'src/mbgl/style/conversion')
-rw-r--r-- | src/mbgl/style/conversion/function.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/conversion/function.cpp b/src/mbgl/style/conversion/function.cpp index 7cc599be1d..6ee962fb77 100644 --- a/src/mbgl/style/conversion/function.cpp +++ b/src/mbgl/style/conversion/function.cpp @@ -52,7 +52,7 @@ std::unique_ptr<Expression> convertTokenStringToExpression(const std::string& so if (pos != end) { for (brace++; brace != end && tokenReservedChars.find(*brace) == std::string::npos; brace++); if (brace != end && *brace == '}') { - inputs.push_back(toString(get(literal(std::string(pos + 1, brace))))); + inputs.push_back(get(literal(std::string(pos + 1, brace)))); pos = brace + 1; } else { inputs.push_back(literal(std::string(pos, brace))); @@ -65,7 +65,7 @@ std::unique_ptr<Expression> convertTokenStringToExpression(const std::string& so case 0: return literal(source); case 1: - return std::move(inputs[0]); + return toString(std::move(inputs[0])); default: return concat(std::move(inputs)); } |