diff options
Diffstat (limited to 'platform/android/src/geojson/multi_line_string.cpp')
-rw-r--r-- | platform/android/src/geojson/multi_line_string.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/platform/android/src/geojson/multi_line_string.cpp b/platform/android/src/geojson/multi_line_string.cpp index 0a0974062c..1aaf53c01f 100644 --- a/platform/android/src/geojson/multi_line_string.cpp +++ b/platform/android/src/geojson/multi_line_string.cpp @@ -7,44 +7,42 @@ namespace mbgl { namespace android { namespace geojson { -jni::Object<MultiLineString> MultiLineString::New(jni::JNIEnv& env, const mbgl::MultiLineString<double>& multiLineString) { - static auto javaClass = jni::Class<MultiLineString>::Singleton(env); +jni::Local<jni::Object<MultiLineString>> MultiLineString::New(jni::JNIEnv& env, const mbgl::MultiLineString<double>& multiLineString) { + static auto& javaClass = jni::Class<MultiLineString>::Singleton(env); static auto method = javaClass.GetStaticMethod<jni::Object<MultiLineString> (jni::Object<java::util::List>)>(env, "fromLngLats"); - return javaClass.Call(env, method, - *jni::SeizeLocal(env, asPointsListsList(env, multiLineString))); + return javaClass.Call(env, method, asPointsListsList(env, multiLineString)); } -mapbox::geojson::multi_line_string MultiLineString::convert(jni::JNIEnv &env, jni::Object<MultiLineString> jMultiLineString) { +mapbox::geojson::multi_line_string MultiLineString::convert(jni::JNIEnv &env, const jni::Object<MultiLineString>& jMultiLineString) { mapbox::geojson::multi_line_string multiLineString; if (jMultiLineString) { - multiLineString = MultiLineString::convert(env, - *jni::SeizeLocal(env, MultiLineString::coordinates(env, jMultiLineString))); + multiLineString = MultiLineString::convert(env, MultiLineString::coordinates(env, jMultiLineString)); } return multiLineString; } -mapbox::geojson::multi_line_string MultiLineString::convert(jni::JNIEnv &env, jni::Object<java::util::List/*<java::util::List<Point>>*/> jPointListsList) { +mapbox::geojson::multi_line_string MultiLineString::convert(jni::JNIEnv &env, const jni::Object<java::util::List/*<java::util::List<Point>>*/>& jPointListsList) { mapbox::geojson::multi_line_string multiLineString; if (jPointListsList) { - auto jPositionListsArray = jni::SeizeLocal(env, java::util::List::toArray<java::util::List>(env, jPointListsList)); + auto jPositionListsArray = java::util::List::toArray<java::util::List>(env, jPointListsList); - auto size = jPositionListsArray->Length(env); + auto size = jPositionListsArray.Length(env); multiLineString.reserve(size); for (std::size_t i = 0; i < size; i++) { - multiLineString.push_back(LineString::convert(env, *jni::SeizeLocal(env, jPositionListsArray->Get(env, i)))); + multiLineString.push_back(LineString::convert(env, jPositionListsArray.Get(env, i))); } } return multiLineString; } -jni::Object<java::util::List> MultiLineString::coordinates(jni::JNIEnv &env, jni::Object<MultiLineString> jLineString) { - static auto javaClass = jni::Class<MultiLineString>::Singleton(env); +jni::Local<jni::Object<java::util::List>> MultiLineString::coordinates(jni::JNIEnv &env, const jni::Object<MultiLineString>& jLineString) { + static auto& javaClass = jni::Class<MultiLineString>::Singleton(env); static auto method = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates"); return jLineString.Call(env, method); } |