[android] Simplify Feature conversion

This commit is contained in:
John Firebaugh
2018-08-22 10:22:23 -07:00
parent 53c3c327f0
commit 115e8625e1
9 changed files with 56 additions and 132 deletions

View File

@@ -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) {