7 files changed, 0 insertions, 198 deletions
diff --git a/platform/android/src/annotation/marker.cpp b/platform/android/src/annotation/marker.cpp
deleted file mode 100644
index 899f87a74f..0000000000
--- a/platform/android/src/annotation/marker.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "marker.hpp"
-
-namespace mbgl {
-namespace android {
-
-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, 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) {
-    jni::Class<Marker>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/annotation/marker.hpp b/platform/android/src/annotation/marker.hpp
deleted file mode 100644
index b38a25b4fb..0000000000
--- a/platform/android/src/annotation/marker.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <jni/jni.hpp>
-
-#include <string>
-
-#include "../geometry/lat_lng.hpp"
-
-namespace mbgl {
-namespace android {
-
-class Marker : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Marker"; };
-
-    static mbgl::Point<double> getPosition(jni::JNIEnv&, const jni::Object<Marker>&);
-
-    static std::string getIconId(jni::JNIEnv&, const jni::Object<Marker>&);
-
-    static void registerNative(jni::JNIEnv&);
-
-};
-
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/annotation/multi_point.hpp b/platform/android/src/annotation/multi_point.hpp
deleted file mode 100644
index 20f1b3eaf2..0000000000
--- a/platform/android/src/annotation/multi_point.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <jni/jni.hpp>
-
-#include "../geometry/lat_lng.hpp"
-#include "../java/util.hpp"
-
-namespace mbgl {
-namespace android {
-
-class MultiPoint : protected mbgl::util::noncopyable {
-
-protected:
-
-  template <class Geometry>
-  static Geometry toGeometry(JNIEnv& env, const jni::Object<java::util::List>& pointsList) {
-      auto jarray = java::util::List::toArray<LatLng>(env, pointsList);
-
-      std::size_t size = jarray.Length(env);
-
-      Geometry geometry;
-      geometry.reserve(size);
-
-      for (std::size_t i = 0; i < size; i++) {
-          geometry.push_back(LatLng::getGeometry(env, jarray.Get(env, i)));
-      }
-
-      return geometry;
-  }
-};
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/annotation/polygon.cpp b/platform/android/src/annotation/polygon.cpp
deleted file mode 100644
index f22cffb100..0000000000
--- a/platform/android/src/annotation/polygon.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "polygon.hpp"
-
-#include "../conversion/color.hpp"
-
-namespace mbgl {
-namespace android {
-
-mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, const jni::Object<Polygon>& polygon) {
-    static auto& javaClass = jni::Class<Polygon>::Singleton(env);
-    static auto points = javaClass.GetField<jni::Object<java::util::List>>(env, "points");
-    static auto holes = javaClass.GetField<jni::Object<java::util::List>>(env, "holes");
-    static auto alpha = javaClass.GetField<float>(env, "alpha");
-    static auto fillColor = javaClass.GetField<int>(env, "fillColor");
-    static auto strokeColor = javaClass.GetField<int>(env, "strokeColor");
-
-    mbgl::Polygon<double> geometry {
-        MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, polygon.Get(env, points))
-    };
-
-    auto jHoleListsArray = java::util::List::toArray<java::util::List>(env, polygon.Get(env, holes));
-
-    std::size_t jHoleListsSize = jHoleListsArray.Length(env);
-    for (std::size_t i = 0; i < jHoleListsSize; i++) {
-        geometry.push_back(MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, jHoleListsArray.Get(env, i)));
-    }
-
-    mbgl::FillAnnotation annotation { geometry };
-    annotation.opacity = polygon.Get(env, alpha);
-    annotation.color = *conversion::convert<mbgl::Color>(env, polygon.Get(env, fillColor));
-    annotation.outlineColor = *conversion::convert<mbgl::Color>(env, polygon.Get(env, strokeColor));
-
-    return annotation;
-}
-
-void Polygon::registerNative(jni::JNIEnv& env) {
-    jni::Class<Polygon>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/annotation/polygon.hpp b/platform/android/src/annotation/polygon.hpp
deleted file mode 100644
index bc21878ef3..0000000000
--- a/platform/android/src/annotation/polygon.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mbgl/annotation/annotation.hpp>
-
-#include "multi_point.hpp"
-
-namespace mbgl {
-namespace android {
-
-class Polygon : private MultiPoint {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Polygon"; };
-
-    static mbgl::FillAnnotation toAnnotation(jni::JNIEnv&, const jni::Object<Polygon>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/annotation/polyline.cpp b/platform/android/src/annotation/polyline.cpp
deleted file mode 100644
index d6161e856e..0000000000
--- a/platform/android/src/annotation/polyline.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "polyline.hpp"
-
-#include "../conversion/color.hpp"
-
-namespace mbgl {
-namespace android {
-
-mbgl::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, const jni::Object<Polyline>& polyline) {
-    static auto& javaClass = jni::Class<Polyline>::Singleton(env);
-    static auto points = javaClass.GetField<jni::Object<java::util::List>>(env, "points");
-    static auto alpha = javaClass.GetField<float>(env, "alpha");
-    static auto color = javaClass.GetField<int>(env, "color");
-    static auto width = javaClass.GetField<float>(env, "width");
-
-    mbgl::LineAnnotation annotation {
-        MultiPoint::toGeometry<mbgl::LineString<double>>(env, polyline.Get(env, points))
-    };
-
-    annotation.opacity = polyline.Get(env, alpha);
-    annotation.color = *conversion::convert<mbgl::Color>(env, polyline.Get(env, color));
-    annotation.width = polyline.Get(env, width);
-
-    return annotation;
-}
-
-void Polyline::registerNative(jni::JNIEnv& env) {
-    jni::Class<Polyline>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file
diff --git a/platform/android/src/annotation/polyline.hpp b/platform/android/src/annotation/polyline.hpp
deleted file mode 100644
index 6178e98cfc..0000000000
--- a/platform/android/src/annotation/polyline.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mbgl/annotation/annotation.hpp>
-
-#include "multi_point.hpp"
-
-namespace mbgl {
-namespace android {
-
-class Polyline : private MultiPoint {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Polyline"; };
-
-    static mbgl::LineAnnotation toAnnotation(jni::JNIEnv&, const jni::Object<Polyline>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
-\ No newline at end of file