diff options
author | Tobrun <tobrun@mapbox.com> | 2018-04-10 11:09:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-10 11:09:42 +0200 |
commit | 44ce5ab08792df5f38560016ed3d41712e8025d0 (patch) | |
tree | 83ff99ff7b811e4f54165058df01eb101750c33e /platform/android/src/style/layers/layer.cpp | |
parent | 351ac83c75955c7e44e49a42156ece83b759612b (diff) | |
download | qtlocation-mapboxgl-44ce5ab08792df5f38560016ed3d41712e8025d0.tar.gz |
Rework expression conversion (#11490)
* [android] - rework expression conversion
Diffstat (limited to 'platform/android/src/style/layers/layer.cpp')
-rw-r--r-- | platform/android/src/style/layers/layer.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index a2f4087fce..6fe6e3cb29 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -26,7 +26,6 @@ // C++ -> Java conversion #include "../conversion/property_value.hpp" #include <mbgl/style/filter.hpp> -#include "../conversion/gson.hpp" #include <string> @@ -153,20 +152,19 @@ namespace android { } }; - jni::Object<gson::JsonArray> Layer::getFilter(jni::JNIEnv& env) { + jni::Object<gson::JsonElement> Layer::getFilter(jni::JNIEnv& env) { using namespace mbgl::style; using namespace mbgl::style::conversion; Filter filter = layer.accept(GetFilterEvaluator()); - jni::jobject* converted = nullptr; + jni::Object<gson::JsonElement> converted; if (filter.is<ExpressionFilter>()) { ExpressionFilter filterExpression = filter.get<ExpressionFilter>(); mbgl::Value expressionValue = filterExpression.expression.get()->serialize(); - conversion::JsonEvaluator jsonEvaluator{env}; - converted = apply_visitor(jsonEvaluator, expressionValue); + converted = gson::JsonElement::New(env, expressionValue); } - return jni::Object<gson::JsonArray>(converted); + return converted; } struct SetSourceLayerEvaluator { |