diff options
Diffstat (limited to 'platform/android/src/native_map_view.cpp')
| -rwxr-xr-x | platform/android/src/native_map_view.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index d49f4f2a59..696849b11b 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -36,6 +36,7 @@ // C++ -> Java conversion #include "conversion/conversion.hpp" #include "conversion/collection.hpp" +#include "style/conversion/filter.hpp" #include "geometry/conversion/feature.hpp" #include "jni.hpp" @@ -721,22 +722,6 @@ jni::Array<jlong> NativeMapView::queryPointAnnotations(JNIEnv& env, jni::Object< return result; } -static inline optional<mbgl::style::Filter> toFilter(jni::JNIEnv& env, jni::Array<jni::Object<>> jfilter) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; - - mbgl::optional<Filter> filter; - if (jfilter) { - Value filterValue(env, jfilter); - auto converted = convert<Filter>(filterValue); - if (!converted) { - mbgl::Log::Error(mbgl::Event::JNI, "Error setting filter: " + converted.error().message); - } - filter = std::move(*converted); - } - return filter; -} - jni::Array<jni::Object<Feature>> NativeMapView::queryRenderedFeaturesForPoint(JNIEnv& env, jni::jfloat x, jni::jfloat y, jni::Array<jni::String> layerIds, jni::Array<jni::Object<>> jfilter) { |