diff options
author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
---|---|---|
committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
commit | 98b34cb0dbf5c50d7f319724c93021418140b15f (patch) | |
tree | 11cd51f86b5c672dda6bfe087f40f77df1553971 /platform/android/src/annotation/marker.cpp | |
parent | ee17d79f9420eb859303d977955454dacc470db6 (diff) | |
parent | 079ba0209ed383c15123902f0810e658c2b0abf4 (diff) | |
download | qtlocation-mapboxgl-98b34cb0dbf5c50d7f319724c93021418140b15f.tar.gz |
Merge remote-tracking branch 'origin' into bwg-vs2017upstream/bwg-vs2017
# Conflicts:
# cmake/mason-dependencies.cmake
Diffstat (limited to 'platform/android/src/annotation/marker.cpp')
-rw-r--r-- | platform/android/src/annotation/marker.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/platform/android/src/annotation/marker.cpp b/platform/android/src/annotation/marker.cpp index a1fe436dbd..899f87a74f 100644 --- a/platform/android/src/annotation/marker.cpp +++ b/platform/android/src/annotation/marker.cpp @@ -3,29 +3,21 @@ namespace mbgl { namespace android { -jni::Class<Marker> Marker::javaClass; - -mbgl::Point<double> Marker::getPosition(jni::JNIEnv& env, jni::Object<Marker> marker) { - static auto positionField = Marker::javaClass.GetField<jni::Object<LatLng>>(env, "position"); - auto jPosition = marker.Get(env, positionField); - auto position = LatLng::getGeometry(env, jPosition); - jni::DeleteLocalRef(env, jPosition); - return position; +mbgl::Point<double> Marker::getPosition(jni::JNIEnv& env, const jni::Object<Marker>& marker) { + static auto& javaClass = jni::Class<Marker>::Singleton(env); + static auto positionField = javaClass.GetField<jni::Object<LatLng>>(env, "position"); + return LatLng::getGeometry(env, marker.Get(env, positionField)); } -std::string Marker::getIconId(jni::JNIEnv& env, jni::Object<Marker> marker) { - static auto iconIdField = Marker::javaClass.GetField<jni::String>(env, "iconId"); - auto jIconId = marker.Get(env, iconIdField); - auto iconId = jni::Make<std::string>(env, jIconId); - jni::DeleteLocalRef(env, jIconId); - return iconId; +std::string Marker::getIconId(jni::JNIEnv& env, const jni::Object<Marker>& marker) { + static auto& javaClass = jni::Class<Marker>::Singleton(env); + static auto iconIdField = javaClass.GetField<jni::String>(env, "iconId"); + return jni::Make<std::string>(env, marker.Get(env, iconIdField)); } void Marker::registerNative(jni::JNIEnv& env) { - // Lookup the class - Marker::javaClass = *jni::Class<Marker>::Find(env).NewGlobalRef(env).release(); + jni::Class<Marker>::Singleton(env); } - } // namespace android } // namespace mbgl
\ No newline at end of file |