diff options
Diffstat (limited to 'platform/android/src/annotation/polyline.cpp')
-rw-r--r-- | platform/android/src/annotation/polyline.cpp | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/platform/android/src/annotation/polyline.cpp b/platform/android/src/annotation/polyline.cpp index 22d25a0f75..080efa1960 100644 --- a/platform/android/src/annotation/polyline.cpp +++ b/platform/android/src/annotation/polyline.cpp @@ -6,38 +6,21 @@ namespace mbgl { namespace android { mbgl::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, jni::Object<Polyline> polyline) { - auto points = jni::SeizeLocal(env, Polyline::getPoints(env, polyline)); - - mbgl::LineAnnotation annotation { MultiPoint::toGeometry<mbgl::LineString<double>>(env, *points) }; - annotation.opacity = { Polyline::getOpacity(env, polyline) }; - annotation.color = { Polyline::getColor(env, polyline) }; - annotation.width = { Polyline::getWidth(env, polyline) }; - - return annotation; -} - -jni::Object<java::util::List> Polyline::getPoints(jni::JNIEnv& env, jni::Object<Polyline> polyline) { static auto javaClass = jni::Class<Polyline>::Singleton(env); - static auto field = javaClass.GetField<jni::Object<java::util::List>>(env, "points"); - return polyline.Get(env, field); -} + static auto points = javaClass.GetField<jni::Object<java::util::List>>(env, "points"); + static auto alpha = javaClass.GetField<float>(env, "alpha"); + static auto color = javaClass.GetField<int>(env, "color"); + static auto width = javaClass.GetField<float>(env, "width"); -float Polyline::getOpacity(jni::JNIEnv& env, jni::Object<Polyline> polyline) { - static auto javaClass = jni::Class<Polyline>::Singleton(env); - static auto field = javaClass.GetField<float>(env, "alpha"); - return polyline.Get(env, field); -} + mbgl::LineAnnotation annotation { + MultiPoint::toGeometry<mbgl::LineString<double>>(env, *jni::SeizeLocal(env, polyline.Get(env, points))) + }; -mbgl::Color Polyline::getColor(jni::JNIEnv& env, jni::Object<Polyline> polyline) { - static auto javaClass = jni::Class<Polyline>::Singleton(env); - static auto field = javaClass.GetField<int>(env, "color"); - return *conversion::convert<mbgl::Color, int>(env, polyline.Get(env, field)); -} + annotation.opacity = polyline.Get(env, alpha); + annotation.color = *conversion::convert<mbgl::Color>(env, polyline.Get(env, color)); + annotation.width = polyline.Get(env, width); -float Polyline::getWidth(jni::JNIEnv& env, jni::Object<Polyline> polyline) { - static auto javaClass = jni::Class<Polyline>::Singleton(env); - static auto field = javaClass.GetField<float>(env, "width"); - return polyline.Get(env, field); + return annotation; } void Polyline::registerNative(jni::JNIEnv& env) { |