summaryrefslogtreecommitdiff
path: root/platform/android/src/style/sources/vector_source.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-08-22 10:22:23 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-09-07 09:44:12 -0700
commit115e8625e14d15f3fe18681e1e05a06271e2c2e0 (patch)
treeca93fe84add2be0d5c87a0a92569a3114fca58dc /platform/android/src/style/sources/vector_source.cpp
parent53c3c327f0ebea276d977f58a59cdb9449165518 (diff)
downloadqtlocation-mapboxgl-115e8625e14d15f3fe18681e1e05a06271e2c2e0.tar.gz
[android] Simplify Feature conversion
Diffstat (limited to 'platform/android/src/style/sources/vector_source.cpp')
-rw-r--r--platform/android/src/style/sources/vector_source.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/src/style/sources/vector_source.cpp b/platform/android/src/style/sources/vector_source.cpp
index 69052bd98c..48eb4ca51c 100644
--- a/platform/android/src/style/sources/vector_source.cpp
+++ b/platform/android/src/style/sources/vector_source.cpp
@@ -9,7 +9,7 @@
// C++ -> Java conversion
#include "../../conversion/conversion.hpp"
#include "../../conversion/collection.hpp"
-#include "../../geojson/conversion/feature.hpp"
+#include "../../geojson/feature.hpp"
#include "../conversion/url_or_tileset.hpp"
#include <mbgl/util/variant.hpp>
@@ -54,7 +54,7 @@ namespace android {
features = rendererFrontend->querySourceFeatures(source.getID(),
{ toVector(env, jSourceLayerIds), toFilter(env, jni::SeizeLocal(env, std::move(jfilter))) });
}
- return *convert<jni::Array<jni::Object<Feature>>, std::vector<mbgl::Feature>>(env, features);
+ return Feature::convert(env, features);
}
jni::Object<Source> VectorSource::createJavaPeer(jni::JNIEnv& env) {