From 5911e3b13f2f2b6741e26db3e41513ed21cc95b4 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 22 Aug 2018 11:44:07 -0700 Subject: [android] Simplify annotation conversion --- platform/android/src/annotation/polygon.cpp | 53 +++++++++------------------- platform/android/src/annotation/polygon.hpp | 19 ---------- platform/android/src/annotation/polyline.cpp | 39 ++++++-------------- platform/android/src/annotation/polyline.hpp | 17 --------- 4 files changed, 27 insertions(+), 101 deletions(-) diff --git a/platform/android/src/annotation/polygon.cpp b/platform/android/src/annotation/polygon.cpp index f049911be0..4168c3ceef 100644 --- a/platform/android/src/annotation/polygon.cpp +++ b/platform/android/src/annotation/polygon.cpp @@ -6,12 +6,21 @@ namespace mbgl { namespace android { mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, jni::Object polygon) { - auto points = jni::SeizeLocal(env, Polygon::getPoints(env, polygon)); - auto holes = jni::SeizeLocal(env, Polygon::getHoles(env, polygon)); + static auto javaClass = jni::Class::Singleton(env); + static auto points = javaClass.GetField>(env, "points"); + static auto holes = javaClass.GetField>(env, "holes"); + static auto alpha = javaClass.GetField(env, "alpha"); + static auto fillColor = javaClass.GetField(env, "fillColor"); + static auto strokeColor = javaClass.GetField(env, "strokeColor"); + + mbgl::Polygon geometry { + MultiPoint::toGeometry>(env, *jni::SeizeLocal(env, polygon.Get(env, points))) + }; - mbgl::Polygon geometry { MultiPoint::toGeometry>(env, *points) }; + auto jHoleListsArray = jni::SeizeLocal(env, + java::util::List::toArray(env, + *jni::SeizeLocal(env, polygon.Get(env, holes)))); - auto jHoleListsArray = jni::SeizeLocal(env, java::util::List::toArray(env, *holes)); std::size_t jHoleListsSize = jHoleListsArray->Length(env); for (std::size_t i = 0; i < jHoleListsSize; i++) { geometry.push_back(MultiPoint::toGeometry>(env, @@ -19,43 +28,13 @@ mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, jni::Object(env, polygon.Get(env, fillColor)); + annotation.outlineColor = *conversion::convert(env, polygon.Get(env, strokeColor)); return annotation; } -jni::Object Polygon::getPoints(jni::JNIEnv& env, jni::Object polygon) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField>(env, "points"); - return polygon.Get(env, field); -} - -jni::Object Polygon::getHoles(jni::JNIEnv& env, jni::Object polygon) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField>(env, "holes"); - return polygon.Get(env, field); -} - -float Polygon::getOpacity(jni::JNIEnv& env, jni::Object polygon) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField(env, "alpha"); - return polygon.Get(env, field); -} - -mbgl::Color Polygon::getFillColor(jni::JNIEnv& env, jni::Object polygon) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField(env, "fillColor"); - return *conversion::convert(env, polygon.Get(env, field)); -} - -mbgl::Color Polygon::getOutlineColor(jni::JNIEnv& env, jni::Object polygon) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField(env, "strokeColor"); - return *conversion::convert(env, polygon.Get(env, field)); -} - void Polygon::registerNative(jni::JNIEnv& env) { jni::Class::Singleton(env); } diff --git a/platform/android/src/annotation/polygon.hpp b/platform/android/src/annotation/polygon.hpp index f7cc015c8a..92d3fe0a71 100644 --- a/platform/android/src/annotation/polygon.hpp +++ b/platform/android/src/annotation/polygon.hpp @@ -1,38 +1,19 @@ #pragma once #include -#include - -#include #include "multi_point.hpp" -#include "../geometry/lat_lng.hpp" -#include "../java/util.hpp" - namespace mbgl { namespace android { class Polygon : private MultiPoint { public: - static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Polygon"; }; static mbgl::FillAnnotation toAnnotation(jni::JNIEnv&, jni::Object); static void registerNative(jni::JNIEnv&); - -private: - - static jni::Object getPoints(jni::JNIEnv&, jni::Object); - - static jni::Object getHoles(jni::JNIEnv&, jni::Object); - - static float getOpacity(jni::JNIEnv&, jni::Object); - - static mbgl::Color getFillColor(jni::JNIEnv&, jni::Object); - - static mbgl::Color getOutlineColor(jni::JNIEnv&, jni::Object); }; 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) { - auto points = jni::SeizeLocal(env, Polyline::getPoints(env, polyline)); - - mbgl::LineAnnotation annotation { MultiPoint::toGeometry>(env, *points) }; - annotation.opacity = { Polyline::getOpacity(env, polyline) }; - annotation.color = { Polyline::getColor(env, polyline) }; - annotation.width = { Polyline::getWidth(env, polyline) }; - - return annotation; -} - -jni::Object Polyline::getPoints(jni::JNIEnv& env, jni::Object polyline) { static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField>(env, "points"); - return polyline.Get(env, field); -} + static auto points = javaClass.GetField>(env, "points"); + static auto alpha = javaClass.GetField(env, "alpha"); + static auto color = javaClass.GetField(env, "color"); + static auto width = javaClass.GetField(env, "width"); -float Polyline::getOpacity(jni::JNIEnv& env, jni::Object polyline) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField(env, "alpha"); - return polyline.Get(env, field); -} + mbgl::LineAnnotation annotation { + MultiPoint::toGeometry>(env, *jni::SeizeLocal(env, polyline.Get(env, points))) + }; -mbgl::Color Polyline::getColor(jni::JNIEnv& env, jni::Object polyline) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField(env, "color"); - return *conversion::convert(env, polyline.Get(env, field)); -} + annotation.opacity = polyline.Get(env, alpha); + annotation.color = *conversion::convert(env, polyline.Get(env, color)); + annotation.width = polyline.Get(env, width); -float Polyline::getWidth(jni::JNIEnv& env, jni::Object polyline) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField(env, "width"); - return polyline.Get(env, field); + return annotation; } void Polyline::registerNative(jni::JNIEnv& env) { diff --git a/platform/android/src/annotation/polyline.hpp b/platform/android/src/annotation/polyline.hpp index 69f5d19c1f..36c2d49e6d 100644 --- a/platform/android/src/annotation/polyline.hpp +++ b/platform/android/src/annotation/polyline.hpp @@ -1,36 +1,19 @@ #pragma once #include -#include - -#include #include "multi_point.hpp" -#include "../geometry/lat_lng.hpp" -#include "../java/util.hpp" - namespace mbgl { namespace android { class Polyline : private MultiPoint { public: - static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Polyline"; }; static mbgl::LineAnnotation toAnnotation(jni::JNIEnv&, jni::Object); static void registerNative(jni::JNIEnv&); - -private: - - static jni::Object getPoints(jni::JNIEnv&, jni::Object); - - static float getOpacity(jni::JNIEnv&, jni::Object); - - static mbgl::Color getColor(jni::JNIEnv&, jni::Object); - - static float getWidth(jni::JNIEnv&, jni::Object); }; -- cgit v1.2.1