diff options
Diffstat (limited to 'platform/android/src/geojson/multi_polygon.cpp')
-rw-r--r-- | platform/android/src/geojson/multi_polygon.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/platform/android/src/geojson/multi_polygon.cpp b/platform/android/src/geojson/multi_polygon.cpp index 109ac714c3..3c5c3ec338 100644 --- a/platform/android/src/geojson/multi_polygon.cpp +++ b/platform/android/src/geojson/multi_polygon.cpp @@ -7,41 +7,39 @@ namespace mbgl { namespace android { namespace geojson { -jni::Object<MultiPolygon> MultiPolygon::New(JNIEnv& env, const mbgl::MultiPolygon<double>& multiPolygon) { - static auto javaClass = jni::Class<MultiPolygon>::Singleton(env); +jni::Local<jni::Object<MultiPolygon>> MultiPolygon::New(JNIEnv& env, const mbgl::MultiPolygon<double>& multiPolygon) { + static auto& javaClass = jni::Class<MultiPolygon>::Singleton(env); static auto method = javaClass.GetStaticMethod<jni::Object<MultiPolygon> (jni::Object<java::util::List>)>(env, "fromLngLats"); - auto jarray = jni::SeizeLocal(env, - jni::Array<jni::Object<java::util::List>>::New(env, multiPolygon.size())); + auto jarray = jni::Array<jni::Object<java::util::List>>::New(env, multiPolygon.size()); for (size_t i = 0; i < multiPolygon.size(); i++) { - jarray->Set(env, i, *jni::SeizeLocal(env, asPointsListsList(env, multiPolygon.at(i)))); + jarray.Set(env, i, asPointsListsList(env, multiPolygon.at(i))); } - return javaClass.Call(env, method, - *jni::SeizeLocal(env, java::util::Arrays::asList(env, *jarray))); + return javaClass.Call(env, method, java::util::Arrays::asList(env, jarray)); } -mapbox::geojson::multi_polygon MultiPolygon::convert(jni::JNIEnv &env, jni::Object<MultiPolygon> jMultiPolygon) { +mapbox::geojson::multi_polygon MultiPolygon::convert(jni::JNIEnv& env, const jni::Object<MultiPolygon>& jMultiPolygon) { mapbox::geojson::multi_polygon multiPolygon; if (jMultiPolygon) { - auto jPointListsListList = jni::SeizeLocal(env, MultiPolygon::coordinates(env, jMultiPolygon)); - auto jPointListsListArray = jni::SeizeLocal(env, java::util::List::toArray<java::util::List>(env, *jPointListsListList)); + auto jPointListsListList = MultiPolygon::coordinates(env, jMultiPolygon); + auto jPointListsListArray = java::util::List::toArray<java::util::List>(env, jPointListsListList); - auto size = jPointListsListArray->Length(env); + auto size = jPointListsListArray.Length(env); multiPolygon.reserve(size); for (size_t i = 0; i < size; i++) { - multiPolygon.push_back(Polygon::convert(env, *jni::SeizeLocal(env, jPointListsListArray->Get(env, i)))); + multiPolygon.push_back(Polygon::convert(env, jPointListsListArray.Get(env, i))); } } return multiPolygon; } -jni::Object<java::util::List> MultiPolygon::coordinates(jni::JNIEnv &env, jni::Object<MultiPolygon> jPolygon) { - static auto javaClass = jni::Class<MultiPolygon>::Singleton(env); +jni::Local<jni::Object<java::util::List>> MultiPolygon::coordinates(jni::JNIEnv& env, const jni::Object<MultiPolygon>& jPolygon) { + static auto& javaClass = jni::Class<MultiPolygon>::Singleton(env); static auto method = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates"); return jPolygon.Call(env, method); } |