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.cpp69
-rw-r--r--platform/android/src/map/camera_position.hpp23
-rw-r--r--platform/android/src/map/image.cpp41
-rw-r--r--platform/android/src/map/image.hpp21
4 files changed, 0 insertions, 154 deletions
diff --git a/platform/android/src/map/camera_position.cpp b/platform/android/src/map/camera_position.cpp
deleted file mode 100644
index 4266b64fdf..0000000000
--- a/platform/android/src/map/camera_position.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "camera_position.hpp"
-#include "../geometry/lat_lng.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<CameraPosition>> CameraPosition::New(jni::JNIEnv &env, mbgl::CameraOptions options, float pixelRatio) {
- static auto& javaClass = jni::Class<CameraPosition>::Singleton(env);
- static auto constructor = javaClass.GetConstructor<jni::Object<LatLng>, double, double, double, jni::Array<jni::jdouble>>(env);
-
- // wrap LatLng values coming from core
- auto center = options.center.value();
- center.wrap();
-
- // convert bearing, measured in radians counterclockwise from true north.
- // Wrapped to [−π rad, π rad). Android binding from 0 to 360 degrees
- double bearing_degrees = options.bearing.value_or(0);
- while (bearing_degrees > 360) {
- bearing_degrees -= 360;
- }
- while (bearing_degrees < 0) {
- bearing_degrees += 360;
- }
-
- // convert tilt, core ranges from [0 rad, 1,0472 rad], android ranges from 0 to 60
- double tilt_degrees = options.pitch.value_or(0);
-
- std::vector<jdouble> paddingVect;
- auto insets = options.padding.value_or(EdgeInsets {0, 0, 0, 0});
- auto padding = jni::Array<jni::jdouble>::New(env, 4);
- paddingVect.push_back(insets.left() * pixelRatio);
- paddingVect.push_back(insets.top() * pixelRatio);
- paddingVect.push_back(insets.right() * pixelRatio);
- paddingVect.push_back(insets.bottom() * pixelRatio);
- padding.SetRegion<std::vector<jni::jdouble>>(env, 0, paddingVect);
-
- return javaClass.New(env, constructor, LatLng::New(env, center), options.zoom.value_or(0), tilt_degrees, bearing_degrees, padding);
-}
-
-mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, const jni::Object<CameraPosition>& position, float pixelRatio) {
- 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");
- static auto paddingField = javaClass.GetField<jni::Array<jni::jdouble>>(env, "padding");
-
- auto padding = position.Get(env, paddingField);
- auto center = LatLng::getLatLng(env, position.Get(env, target));
-
- return mbgl::CameraOptions{center,
- padding && padding.Length(env) == 4 ? EdgeInsets{padding.Get(env, 1) * pixelRatio,
- padding.Get(env, 0) * pixelRatio,
- padding.Get(env, 3) * pixelRatio,
- padding.Get(env, 2) * pixelRatio}
- : (EdgeInsets){},
- {},
- position.Get(env, zoom),
- position.Get(env, bearing),
- position.Get(env, tilt)};
-}
-
-void CameraPosition::registerNative(jni::JNIEnv &env) {
- jni::Class<CameraPosition>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mb
-
diff --git a/platform/android/src/map/camera_position.hpp b/platform/android/src/map/camera_position.hpp
deleted file mode 100644
index b677f04ea0..0000000000
--- a/platform/android/src/map/camera_position.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/map/camera.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class CameraPosition : private mbgl::util::noncopyable {
-public:
- static constexpr auto Name() { return "com/mapbox/mapboxsdk/camera/CameraPosition"; };
-
- static jni::Local<jni::Object<CameraPosition>> New(jni::JNIEnv&, mbgl::CameraOptions, float pixelRatio);
-
- static mbgl::CameraOptions getCameraOptions(jni::JNIEnv&, const jni::Object<CameraPosition>&, float pixelRatio);
-
- 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
deleted file mode 100644
index 10c32d2577..0000000000
--- a/platform/android/src/map/image.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <mbgl/style/image.hpp>
-#include <mbgl/util/exception.hpp>
-#include "image.hpp"
-
-namespace mbgl {
-namespace android {
-
-mbgl::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object<Image>& image) {
- 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 name = jni::Make<std::string>(env, image.Get(env, nameField));
- auto sdf = (bool) image.Get(env, sdfField);
-
- 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::StyleImageException("Image pixel count mismatch");
- }
-
- 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) {
- jni::Class<Image>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mb
diff --git a/platform/android/src/map/image.hpp b/platform/android/src/map/image.hpp
deleted file mode 100644
index 7549bc646a..0000000000
--- a/platform/android/src/map/image.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-#include <mbgl/style/image.hpp>
-
-namespace mbgl {
-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&, const jni::Object<Image>&);
-
- static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl \ No newline at end of file
View Lorry Controller Status