diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-08-22 11:44:07 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-09-07 09:44:12 -0700 |
commit | 5911e3b13f2f2b6741e26db3e41513ed21cc95b4 (patch) | |
tree | 96f34a8bc5dfa2536f078f40ea1cac21486c4507 | |
parent | 6be8302296147515e0b0d7ed7cc46d195227118e (diff) | |
download | qtlocation-mapboxgl-5911e3b13f2f2b6741e26db3e41513ed21cc95b4.tar.gz |
[android] Simplify annotation conversion
-rw-r--r-- | platform/android/src/annotation/polygon.cpp | 53 | ||||
-rw-r--r-- | platform/android/src/annotation/polygon.hpp | 19 | ||||
-rw-r--r-- | platform/android/src/annotation/polyline.cpp | 39 | ||||
-rw-r--r-- | 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> polygon) { - auto points = jni::SeizeLocal(env, Polygon::getPoints(env, polygon)); - auto holes = jni::SeizeLocal(env, Polygon::getHoles(env, polygon)); + static auto javaClass = jni::Class<Polygon>::Singleton(env); + static auto points = javaClass.GetField<jni::Object<java::util::List>>(env, "points"); + static auto holes = javaClass.GetField<jni::Object<java::util::List>>(env, "holes"); + static auto alpha = javaClass.GetField<float>(env, "alpha"); + static auto fillColor = javaClass.GetField<int>(env, "fillColor"); + static auto strokeColor = javaClass.GetField<int>(env, "strokeColor"); + + mbgl::Polygon<double> geometry { + MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, *jni::SeizeLocal(env, polygon.Get(env, points))) + }; - mbgl::Polygon<double> geometry { MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, *points) }; + auto jHoleListsArray = jni::SeizeLocal(env, + java::util::List::toArray<java::util::List>(env, + *jni::SeizeLocal(env, polygon.Get(env, holes)))); - auto jHoleListsArray = jni::SeizeLocal(env, java::util::List::toArray<java::util::List>(env, *holes)); std::size_t jHoleListsSize = jHoleListsArray->Length(env); for (std::size_t i = 0; i < jHoleListsSize; i++) { geometry.push_back(MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, @@ -19,43 +28,13 @@ mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, jni::Object<Polygon } mbgl::FillAnnotation annotation { geometry }; - annotation.opacity = { Polygon::getOpacity(env, polygon) }; - annotation.color = { Polygon::getFillColor(env, polygon) }; - annotation.outlineColor = { Polygon::getOutlineColor(env, polygon) }; + annotation.opacity = polygon.Get(env, alpha); + annotation.color = *conversion::convert<mbgl::Color>(env, polygon.Get(env, fillColor)); + annotation.outlineColor = *conversion::convert<mbgl::Color>(env, polygon.Get(env, strokeColor)); return annotation; } -jni::Object<java::util::List> Polygon::getPoints(jni::JNIEnv& env, jni::Object<Polygon> polygon) { - static auto javaClass = jni::Class<Polygon>::Singleton(env); - static auto field = javaClass.GetField<jni::Object<java::util::List>>(env, "points"); - return polygon.Get(env, field); -} - -jni::Object<java::util::List> Polygon::getHoles(jni::JNIEnv& env, jni::Object<Polygon> polygon) { - static auto javaClass = jni::Class<Polygon>::Singleton(env); - static auto field = javaClass.GetField<jni::Object<java::util::List>>(env, "holes"); - return polygon.Get(env, field); -} - -float Polygon::getOpacity(jni::JNIEnv& env, jni::Object<Polygon> polygon) { - static auto javaClass = jni::Class<Polygon>::Singleton(env); - static auto field = javaClass.GetField<float>(env, "alpha"); - return polygon.Get(env, field); -} - -mbgl::Color Polygon::getFillColor(jni::JNIEnv& env, jni::Object<Polygon> polygon) { - static auto javaClass = jni::Class<Polygon>::Singleton(env); - static auto field = javaClass.GetField<int>(env, "fillColor"); - return *conversion::convert<mbgl::Color, int>(env, polygon.Get(env, field)); -} - -mbgl::Color Polygon::getOutlineColor(jni::JNIEnv& env, jni::Object<Polygon> polygon) { - static auto javaClass = jni::Class<Polygon>::Singleton(env); - static auto field = javaClass.GetField<int>(env, "strokeColor"); - return *conversion::convert<mbgl::Color, int>(env, polygon.Get(env, field)); -} - void Polygon::registerNative(jni::JNIEnv& env) { jni::Class<Polygon>::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 <mbgl/annotation/annotation.hpp> -#include <mbgl/util/color.hpp> - -#include <string> #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<Polygon>); static void registerNative(jni::JNIEnv&); - -private: - - static jni::Object<java::util::List> getPoints(jni::JNIEnv&, jni::Object<Polygon>); - - static jni::Object<java::util::List> getHoles(jni::JNIEnv&, jni::Object<Polygon>); - - static float getOpacity(jni::JNIEnv&, jni::Object<Polygon>); - - static mbgl::Color getFillColor(jni::JNIEnv&, jni::Object<Polygon>); - - static mbgl::Color getOutlineColor(jni::JNIEnv&, jni::Object<Polygon>); }; 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) { 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 <mbgl/annotation/annotation.hpp> -#include <mbgl/util/color.hpp> - -#include <string> #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<Polyline>); static void registerNative(jni::JNIEnv&); - -private: - - static jni::Object<java::util::List> getPoints(jni::JNIEnv&, jni::Object<Polyline>); - - static float getOpacity(jni::JNIEnv&, jni::Object<Polyline>); - - static mbgl::Color getColor(jni::JNIEnv&, jni::Object<Polyline>); - - static float getWidth(jni::JNIEnv&, jni::Object<Polyline>); }; |