summaryrefslogtreecommitdiff
path: root/platform/android/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'platform/android/src/map')
-rw-r--r--platform/android/src/map/camera_position.cpp24
-rw-r--r--platform/android/src/map/camera_position.hpp5
-rw-r--r--platform/android/src/map/image.cpp33
-rw-r--r--platform/android/src/map/image.hpp5
4 files changed, 23 insertions, 44 deletions
diff --git a/platform/android/src/map/camera_position.cpp b/platform/android/src/map/camera_position.cpp
index 01ffc6530b..5700341d65 100644
--- a/platform/android/src/map/camera_position.cpp
+++ b/platform/android/src/map/camera_position.cpp
@@ -5,7 +5,8 @@ namespace mbgl {
namespace android {
jni::Object<CameraPosition> CameraPosition::New(jni::JNIEnv &env, mbgl::CameraOptions options) {
- static auto constructor = CameraPosition::javaClass.GetConstructor<jni::Object<LatLng>, double, double, double>(env);
+ static auto javaClass = jni::Class<CameraPosition>::Singleton(env);
+ static auto constructor = javaClass.GetConstructor<jni::Object<LatLng>, double, double, double>(env);
// wrap LatLng values coming from core
auto center = options.center.value();
@@ -24,18 +25,17 @@ jni::Object<CameraPosition> CameraPosition::New(jni::JNIEnv &env, mbgl::CameraOp
// convert tilt, core ranges from [0 rad, 1,0472 rad], android ranges from 0 to 60
double tilt_degrees = options.pitch.value_or(0) * util::RAD2DEG;
- return CameraPosition::javaClass.New(env, constructor, LatLng::New(env, center), options.zoom.value_or(0), tilt_degrees, bearing_degrees);
+ return javaClass.New(env, constructor, LatLng::New(env, center), options.zoom.value_or(0), tilt_degrees, bearing_degrees);
}
mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, jni::Object<CameraPosition> position) {
- static auto bearing = CameraPosition::javaClass.GetField<jni::jdouble>(env, "bearing");
- static auto target = CameraPosition::javaClass.GetField<jni::Object<LatLng>>(env, "target");
- static auto tilt = CameraPosition::javaClass.GetField<jni::jdouble>(env, "tilt");
- static auto zoom = CameraPosition::javaClass.GetField<jni::jdouble>(env, "zoom");
+ static auto javaClass = jni::Class<CameraPosition>::Singleton(env);
+ static auto bearing = javaClass.GetField<jni::jdouble>(env, "bearing");
+ static auto target = javaClass.GetField<jni::Object<LatLng>>(env, "target");
+ static auto tilt = javaClass.GetField<jni::jdouble>(env, "tilt");
+ static auto zoom = javaClass.GetField<jni::jdouble>(env, "zoom");
- auto jtarget = position.Get(env, target);
- auto center = LatLng::getLatLng(env, jtarget);
- jni::DeleteLocalRef(env, jtarget);
+ auto center = LatLng::getLatLng(env, *jni::SeizeLocal(env, position.Get(env, target)));
return mbgl::CameraOptions {
center,
@@ -48,13 +48,9 @@ mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, jni::Obje
}
void CameraPosition::registerNative(jni::JNIEnv &env) {
- // Lookup the class
- CameraPosition::javaClass = *jni::Class<CameraPosition>::Find(env).NewGlobalRef(env).release();
+ jni::Class<CameraPosition>::Singleton(env);
}
-jni::Class<CameraPosition> CameraPosition::javaClass;
-
-
} // namespace android
} // namespace mb
diff --git a/platform/android/src/map/camera_position.hpp b/platform/android/src/map/camera_position.hpp
index 4eee8be758..d577811915 100644
--- a/platform/android/src/map/camera_position.hpp
+++ b/platform/android/src/map/camera_position.hpp
@@ -10,19 +10,14 @@ namespace android {
class CameraPosition : private mbgl::util::noncopyable {
public:
-
static constexpr auto Name() { return "com/mapbox/mapboxsdk/camera/CameraPosition"; };
static jni::Object<CameraPosition> New(jni::JNIEnv&, mbgl::CameraOptions);
static mbgl::CameraOptions getCameraOptions(jni::JNIEnv&, jni::Object<CameraPosition>);
- static jni::Class<CameraPosition> javaClass;
-
static void registerNative(jni::JNIEnv&);
-
};
-
} // namespace android
} // namespace mbgl \ No newline at end of file
diff --git a/platform/android/src/map/image.cpp b/platform/android/src/map/image.cpp
index ce89e22d7a..ee3c7012a7 100644
--- a/platform/android/src/map/image.cpp
+++ b/platform/android/src/map/image.cpp
@@ -6,43 +6,36 @@ namespace mbgl {
namespace android {
mbgl::style::Image Image::getImage(jni::JNIEnv& env, jni::Object<Image> image) {
- static auto widthField = Image::javaClass.GetField<jni::jint>(env, "width");
- static auto heightField = Image::javaClass.GetField<jni::jint>(env, "height");
- static auto pixelRatioField = Image::javaClass.GetField<jni::jfloat>(env, "pixelRatio");
- static auto bufferField = Image::javaClass.GetField<jni::Array<jbyte>>(env, "buffer");
- static auto nameField = Image::javaClass.GetField<jni::String>(env, "name");
- static auto sdfField = Image::javaClass.GetField<jni::jboolean>(env, "sdf");
+ static auto javaClass = jni::Class<Image>::Singleton(env);
+ static auto widthField = javaClass.GetField<jni::jint>(env, "width");
+ static auto heightField = javaClass.GetField<jni::jint>(env, "height");
+ static auto pixelRatioField = javaClass.GetField<jni::jfloat>(env, "pixelRatio");
+ static auto bufferField = javaClass.GetField<jni::Array<jbyte>>(env, "buffer");
+ static auto nameField = javaClass.GetField<jni::String>(env, "name");
+ static auto sdfField = javaClass.GetField<jni::jboolean>(env, "sdf");
auto height = image.Get(env, heightField);
auto width = image.Get(env, widthField);
auto pixelRatio = image.Get(env, pixelRatioField);
- auto pixels = image.Get(env, bufferField);
- auto jName = image.Get(env, nameField);
- auto name = jni::Make<std::string>(env, jName);
+ auto pixels = jni::SeizeLocal(env, image.Get(env, bufferField));
+ auto name = jni::Make<std::string>(env, *jni::SeizeLocal(env, image.Get(env, nameField)));
auto sdf = (bool) image.Get(env, sdfField);
- jni::DeleteLocalRef(env, jName);
- jni::NullCheck(env, &pixels);
- std::size_t size = pixels.Length(env);
+ jni::NullCheck(env, pixels->Get());
+ std::size_t size = pixels->Length(env);
mbgl::PremultipliedImage premultipliedImage({ static_cast<uint32_t>(width), static_cast<uint32_t>(height) });
if (premultipliedImage.bytes() != uint32_t(size)) {
throw mbgl::util::SpriteImageException("Sprite image pixel count mismatch");
}
- jni::GetArrayRegion(env, *pixels, 0, size, reinterpret_cast<jbyte*>(premultipliedImage.data.get()));
- jni::DeleteLocalRef(env, pixels);
+ jni::GetArrayRegion(env, **pixels, 0, size, reinterpret_cast<jbyte*>(premultipliedImage.data.get()));
return mbgl::style::Image {name, std::move(premultipliedImage), pixelRatio, sdf};
}
void Image::registerNative(jni::JNIEnv &env) {
- // Lookup the class
- Image::javaClass = *jni::Class<Image>::Find(env).NewGlobalRef(env).release();
+ jni::Class<Image>::Singleton(env);
}
-jni::Class<Image> Image::javaClass;
-
-
} // namespace android
} // namespace mb
-
diff --git a/platform/android/src/map/image.hpp b/platform/android/src/map/image.hpp
index 1513e13ee7..17ed4cbef8 100644
--- a/platform/android/src/map/image.hpp
+++ b/platform/android/src/map/image.hpp
@@ -10,17 +10,12 @@ namespace android {
class Image : private mbgl::util::noncopyable {
public:
-
static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/Image"; };
static mbgl::style::Image getImage(jni::JNIEnv&, jni::Object<Image>);
- static jni::Class<Image> javaClass;
-
static void registerNative(jni::JNIEnv&);
-
};
-
} // namespace android
} // namespace mbgl \ No newline at end of file
View Lorry Controller Status