summaryrefslogtreecommitdiff
path: root/platform/android/src/style/conversion/position.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-08-17 16:25:12 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-08-21 09:26:44 -0700
commit2ff1ac309727a5f34cfa9472dc5802d5b5c3113c (patch)
tree14cafb88bc86c6f1d7a257129c2878f2c702bce8 /platform/android/src/style/conversion/position.hpp
parent7ce6af3f55d94e5e271aeafff44a11508b79dead (diff)
downloadqtlocation-mapboxgl-2ff1ac309727a5f34cfa9472dc5802d5b5c3113c.tar.gz
[android] Move conversion code to .cpp files
Diffstat (limited to 'platform/android/src/style/conversion/position.hpp')
-rw-r--r--platform/android/src/style/conversion/position.hpp26
1 files changed, 7 insertions, 19 deletions
diff --git a/platform/android/src/style/conversion/position.hpp b/platform/android/src/style/conversion/position.hpp
index f32a892c0c..2ef4bf4395 100644
--- a/platform/android/src/style/conversion/position.hpp
+++ b/platform/android/src/style/conversion/position.hpp
@@ -1,37 +1,25 @@
#pragma once
#include "../../conversion/conversion.hpp"
+#include "../position.hpp"
-#include <jni/jni.hpp>
#include <mbgl/style/position.hpp>
-#include "../../jni/local_object.hpp"
-#include "../position.hpp"
+#include <jni/jni.hpp>
namespace mbgl {
namespace android {
namespace conversion {
-template<>
+template <>
struct Converter<jni::Object<Position>, mbgl::style::Position> {
- Result<jni::Object<Position>> operator()(jni::JNIEnv &env, const mbgl::style::Position &value) const {
- std::array<float, 3> cartPosition = value.getSpherical();
- return Position::fromPosition(env, cartPosition[0], cartPosition[1], cartPosition[2]);
- }
+ Result<jni::Object<Position>> operator()(jni::JNIEnv &env, const mbgl::style::Position &value) const;
};
-template<>
+template <>
struct Converter<mbgl::style::Position, jni::Object<Position>> {
- Result<mbgl::style::Position> operator()(jni::JNIEnv &env, const jni::Object<Position> &value) const {
- float radialCoordinate = Position::getRadialCoordinate(env, value);
- float azimuthalAngle = Position::getAzimuthalAngle(env, value);
- float polarAngle = Position::getPolarAngle(env, value);
- std::array<float, 3> cartPosition {{radialCoordinate, azimuthalAngle, polarAngle}};
- mbgl::style::Position position{};
- position.set(cartPosition);
- return position;
- }
+ Result<mbgl::style::Position> operator()(jni::JNIEnv &env, const jni::Object<Position> &value) const;
};
}
}
-} \ No newline at end of file
+}