Merge remote-tracking branch 'origin' into bwg-vs2017upstream/bwg-vs2017

# Conflicts:
#	cmake/mason-dependencies.cmake

1 files changed, 1 insertions, 22 deletions

diff --git a/platform/android/src/annotation/polygon.hpp b/platform/android/src/annotation/polygon.hpp
index a98b2822cf..bc21878ef3 100644
--- a/platform/android/src/annotation/polygon.hpp
+++ b/platform/android/src/annotation/polygon.hpp
@@ -1,40 +1,19 @@
 #pragma once
 
 #include <mbgl/annotation/annotation.hpp>
-#include <mbgl/util/color.hpp>
-
-#include <string>
 
 #include "multi_point.hpp"
 
-#include "../geometry/lat_lng.hpp"
-#include "../java/util.hpp"
-
 namespace mbgl {
 namespace android {
 
 class Polygon : private MultiPoint {
 public:
-
     static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Polygon"; };
 
-    static jni::Class<Polygon> javaClass;
-
-    static mbgl::FillAnnotation toAnnotation(jni::JNIEnv&, jni::Object<Polygon>);
+    static mbgl::FillAnnotation toAnnotation(jni::JNIEnv&, const jni::Object<Polygon>&);
 
     static void registerNative(jni::JNIEnv&);
-
-private:
-
-    static jni::Object<java::util::List> getPoints(jni::JNIEnv&, jni::Object<Polygon>);
-
-    static jni::Object<java::util::List> getHoles(jni::JNIEnv&, jni::Object<Polygon>);
-
-    static float getOpacity(jni::JNIEnv&, jni::Object<Polygon>);
-
-    static mbgl::Color getFillColor(jni::JNIEnv&, jni::Object<Polygon>);
-
-    static mbgl::Color getOutlineColor(jni::JNIEnv&, jni::Object<Polygon>);
 };