From 53c3c327f0ebea276d977f58a59cdb9449165518 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 17 Aug 2018 13:43:07 -0700
Subject: [android] Upgrade to latest jni.hpp

---
 platform/android/src/geojson/point.hpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'platform/android/src/geojson/point.hpp')

diff --git a/platform/android/src/geojson/point.hpp b/platform/android/src/geojson/point.hpp
index 627bd1b649..3a852a3e74 100644
--- a/platform/android/src/geojson/point.hpp
+++ b/platform/android/src/geojson/point.hpp
@@ -26,8 +26,6 @@ public:
 
     static jni::Object<java::util::List> coordinates(JNIEnv&, jni::Object<Point>);
 
-    static jni::Class<Point> javaClass;
-
     static void registerNative(jni::JNIEnv&);
 };
 
-- 
cgit v1.2.1


From 3948bbd7775ea336e54fa6f152f05a139ee88750 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 22 Aug 2018 10:48:21 -0700
Subject: [android] Simplify Point conversion

---
 platform/android/src/geojson/point.hpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'platform/android/src/geojson/point.hpp')

diff --git a/platform/android/src/geojson/point.hpp b/platform/android/src/geojson/point.hpp
index 3a852a3e74..d5cc7780f3 100644
--- a/platform/android/src/geojson/point.hpp
+++ b/platform/android/src/geojson/point.hpp
@@ -1,9 +1,7 @@
 #pragma once
 
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/geometry.hpp>
 
-#include "../java/util.hpp"
 #include "geometry.hpp"
 
 #include <jni/jni.hpp>
@@ -15,16 +13,10 @@ namespace geojson {
 class Point : public Geometry {
 public:
     static constexpr auto Name() { return "com/mapbox/geojson/Point"; };
-
     static constexpr auto Type() { return "Point"; };
 
     static jni::Object<Point> New(jni::JNIEnv&, const mbgl::Point<double>&);
-
-    static mapbox::geojson::point convert(jni::JNIEnv&, jni::Object<Point>);
-
-    static mapbox::geojson::point convert(jni::JNIEnv&, jni::Object<java::util::List/*<Double>*/>);
-
-    static jni::Object<java::util::List> coordinates(JNIEnv&, jni::Object<Point>);
+    static mbgl::Point<double> convert(jni::JNIEnv&, jni::Object<Point>);
 
     static void registerNative(jni::JNIEnv&);
 };
-- 
cgit v1.2.1


From 79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 22 Aug 2018 12:27:43 -0700
Subject: [android] jni.hpp 4.0.0

---
 platform/android/src/geojson/point.hpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'platform/android/src/geojson/point.hpp')

diff --git a/platform/android/src/geojson/point.hpp b/platform/android/src/geojson/point.hpp
index d5cc7780f3..b5d71ecae1 100644
--- a/platform/android/src/geojson/point.hpp
+++ b/platform/android/src/geojson/point.hpp
@@ -10,13 +10,14 @@ namespace mbgl {
 namespace android {
 namespace geojson {
 
-class Point : public Geometry {
+class Point {
 public:
+    using SuperTag = Geometry;
     static constexpr auto Name() { return "com/mapbox/geojson/Point"; };
     static constexpr auto Type() { return "Point"; };
 
-    static jni::Object<Point> New(jni::JNIEnv&, const mbgl::Point<double>&);
-    static mbgl::Point<double> convert(jni::JNIEnv&, jni::Object<Point>);
+    static jni::Local<jni::Object<Point>> New(jni::JNIEnv&, const mbgl::Point<double>&);
+    static mbgl::Point<double> convert(jni::JNIEnv&, const jni::Object<Point>&);
 
     static void registerNative(jni::JNIEnv&);
 };
-- 
cgit v1.2.1