8 files changed, 0 insertions, 216 deletions
diff --git a/platform/android/src/geometry/lat_lng.cpp b/platform/android/src/geometry/lat_lng.cpp
deleted file mode 100644
index 5d8313cb2a..0000000000
--- a/platform/android/src/geometry/lat_lng.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "lat_lng.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<LatLng>> LatLng::New(jni::JNIEnv& env, const mbgl::LatLng& latLng) {
-    static auto& javaClass = jni::Class<LatLng>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<double, double>(env);
-    return javaClass.New(env, constructor, latLng.latitude(), latLng.longitude());
-}
-
-mbgl::Point<double> LatLng::getGeometry(jni::JNIEnv& env, const jni::Object<LatLng>& latLng) {
-    static auto& javaClass = jni::Class<LatLng>::Singleton(env);
-    static auto latitudeField = javaClass.GetField<jni::jdouble>(env, "latitude");
-    static auto longitudeField = javaClass.GetField<jni::jdouble>(env, "longitude");
-    return mbgl::Point<double>(latLng.Get(env, longitudeField), latLng.Get(env, latitudeField));
-}
-
-mbgl::LatLng LatLng::getLatLng(jni::JNIEnv& env, const jni::Object<LatLng>& latLng) {
-    auto point = LatLng::getGeometry(env, latLng);
-    return mbgl::LatLng(point.y, point.x);
-}
-
-void LatLng::registerNative(jni::JNIEnv& env) {
-    jni::Class<LatLng>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng.hpp b/platform/android/src/geometry/lat_lng.hpp
deleted file mode 100644
index 30b7db1ef3..0000000000
--- a/platform/android/src/geometry/lat_lng.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geometry.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class LatLng : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLng"; };
-
-    static jni::Local<jni::Object<LatLng>> New(jni::JNIEnv&, const mbgl::LatLng&);
-
-    static mbgl::Point<double> getGeometry(jni::JNIEnv&, const jni::Object<LatLng>&);
-
-    static mbgl::LatLng getLatLng(jni::JNIEnv&, const jni::Object<LatLng>&);
-
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng_bounds.cpp b/platform/android/src/geometry/lat_lng_bounds.cpp
deleted file mode 100644
index cf534a06e4..0000000000
--- a/platform/android/src/geometry/lat_lng_bounds.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "lat_lng_bounds.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<LatLngBounds>> LatLngBounds::New(jni::JNIEnv& env, mbgl::LatLngBounds bounds) {
-    static auto& javaClass = jni::Class<LatLngBounds>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<double, double, double, double>(env);
-    return javaClass.New(env, constructor, bounds.north(), bounds.east(), bounds.south(), bounds.west());
-}
-
-mbgl::LatLngBounds LatLngBounds::getLatLngBounds(jni::JNIEnv& env, const jni::Object<LatLngBounds>& bounds) {
-    static auto& javaClass = jni::Class<LatLngBounds>::Singleton(env);
-    static auto swLatField = javaClass.GetField<jni::jdouble>(env, "latitudeSouth");
-    static auto swLonField = javaClass.GetField<jni::jdouble>(env, "longitudeWest");
-    static auto neLatField = javaClass.GetField<jni::jdouble>(env, "latitudeNorth");
-    static auto neLonField = javaClass.GetField<jni::jdouble>(env, "longitudeEast");
-
-    mbgl::LatLng sw = { bounds.Get(env, swLatField), bounds.Get(env, swLonField) };
-    mbgl::LatLng ne = { bounds.Get(env, neLatField), bounds.Get(env, neLonField) };
-
-    return mbgl::LatLngBounds::hull(sw, ne);
-}
-
-void LatLngBounds::registerNative(jni::JNIEnv& env) {
-    jni::Class<LatLngBounds>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng_bounds.hpp b/platform/android/src/geometry/lat_lng_bounds.hpp
deleted file mode 100644
index d51026711d..0000000000
--- a/platform/android/src/geometry/lat_lng_bounds.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geometry.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class LatLngBounds : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLngBounds"; };
-
-    static jni::Local<jni::Object<LatLngBounds>> New(jni::JNIEnv&, mbgl::LatLngBounds);
-
-    static mbgl::LatLngBounds getLatLngBounds(jni::JNIEnv&, const jni::Object<LatLngBounds>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng_quad.cpp b/platform/android/src/geometry/lat_lng_quad.cpp
deleted file mode 100644
index 1a1e49048b..0000000000
--- a/platform/android/src/geometry/lat_lng_quad.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "lat_lng_quad.hpp"
-#include "lat_lng.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<LatLngQuad>> LatLngQuad::New(jni::JNIEnv& env, std::array<mbgl::LatLng, 4> coordinates) {
-    static auto& javaClass = jni::Class<LatLngQuad>::Singleton(env);
-    static auto quadConstructor = javaClass.GetConstructor<jni::Object<LatLng>, jni::Object<LatLng>, jni::Object<LatLng>, jni::Object<LatLng>>(env);
-    return javaClass.New(env, quadConstructor,
-        LatLng::New(env, coordinates[0]),
-        LatLng::New(env, coordinates[1]),
-        LatLng::New(env, coordinates[2]),
-        LatLng::New(env, coordinates[3]));
-}
-
-std::array<mbgl::LatLng, 4> LatLngQuad::getLatLngArray(jni::JNIEnv& env, const jni::Object<LatLngQuad>& quad) {
-    static auto& javaClass = jni::Class<LatLngQuad>::Singleton(env);
-    static auto topLeftField = javaClass.GetField <jni::Object<LatLng>>(env, "topLeft");
-    static auto topRightField = javaClass.GetField <jni::Object<LatLng>>(env, "topRight");
-    static auto bottomRightField = javaClass.GetField <jni::Object<LatLng>>(env, "bottomRight");
-    static auto bottomLeftField = javaClass.GetField <jni::Object<LatLng>>(env, "bottomLeft");
-
-    return std::array < mbgl::LatLng, 4 > {{
-        LatLng::getLatLng(env, quad.Get(env, topLeftField)),
-        LatLng::getLatLng(env, quad.Get(env, topRightField)),
-        LatLng::getLatLng(env, quad.Get(env, bottomRightField)),
-        LatLng::getLatLng(env, quad.Get(env, bottomLeftField))
-    }};
-}
-
-void LatLngQuad::registerNative(jni::JNIEnv& env) {
-    jni::Class<LatLngQuad>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng_quad.hpp b/platform/android/src/geometry/lat_lng_quad.hpp
deleted file mode 100644
index f6560b57ba..0000000000
--- a/platform/android/src/geometry/lat_lng_quad.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geometry.hpp>
-
-#include <jni/jni.hpp>
-#include <array>
-
-namespace mbgl {
-namespace android {
-
-class LatLngQuad : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLngQuad"; };
-
-    static jni::Local<jni::Object<LatLngQuad>> New(jni::JNIEnv&, std::array<mbgl::LatLng, 4>);
-
-    static std::array<mbgl::LatLng, 4> getLatLngArray(jni::JNIEnv&, const jni::Object<LatLngQuad>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/geometry/projected_meters.cpp b/platform/android/src/geometry/projected_meters.cpp
deleted file mode 100644
index e079de0062..0000000000
--- a/platform/android/src/geometry/projected_meters.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "projected_meters.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<ProjectedMeters>> ProjectedMeters::New(jni::JNIEnv& env, double northing, double easting) {
-    static auto& javaClass = jni::Class<ProjectedMeters>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<double, double>(env);
-    return javaClass.New(env, constructor, northing, easting);
-}
-
-void ProjectedMeters::registerNative(jni::JNIEnv& env) {
-    jni::Class<ProjectedMeters>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/geometry/projected_meters.hpp b/platform/android/src/geometry/projected_meters.hpp
deleted file mode 100644
index baad1efc81..0000000000
--- a/platform/android/src/geometry/projected_meters.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/geometry.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class ProjectedMeters : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/ProjectedMeters"; };
-
-    static jni::Local<jni::Object<ProjectedMeters>> New(jni::JNIEnv&, double, double);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file