summaryrefslogtreecommitdiff
path: root/platform/android/src/conversion/constant.cpp
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2018-09-28 09:05:41 +0200
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2018-10-24 13:35:36 +0200
commit12b496945498358b7afb4af1efe4ae0c52b9c7d3 (patch)
treec4d4c31cbccfb39bcc8a4fd6a2a09f627173a56b /platform/android/src/conversion/constant.cpp
parent78a1c30e80c70f36ffec8193753919277418a3ca (diff)
downloadqtlocation-mapboxgl-12b496945498358b7afb4af1efe4ae0c52b9c7d3.tar.gz
[android] "format" expression support
Diffstat (limited to 'platform/android/src/conversion/constant.cpp')
-rw-r--r--platform/android/src/conversion/constant.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/src/conversion/constant.cpp b/platform/android/src/conversion/constant.cpp
index a609dc7c60..0671fa6a32 100644
--- a/platform/android/src/conversion/constant.cpp
+++ b/platform/android/src/conversion/constant.cpp
@@ -1,5 +1,6 @@
#include "constant.hpp"
#include "collection.hpp"
+#include "../style/formatted.hpp"
#include <mbgl/util/string.hpp>
@@ -39,7 +40,7 @@ Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, Color>::o
}
Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, style::expression::Formatted>::operator()(jni::JNIEnv& env, const style::expression::Formatted& value) const {
- return jni::Make<jni::String>(env, value.toString());
+ return Formatted::New(env, value);
}
Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, std::vector<std::string>>::operator()(jni::JNIEnv& env, const std::vector<std::string>& value) const {