1 files changed, 23 insertions, 73 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index c6ac6dc6e2..6c092ee0c8 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -119,24 +119,12 @@ final class NativeMapView {
         nativeDestroySurface(mNativeMapViewPtr);
     }
 
-    public void pause() {
-        nativePause(mNativeMapViewPtr);
-    }
-
-    public boolean isPaused() {
-        return nativeIsPaused(mNativeMapViewPtr);
-    }
-
-    public void resume() {
-        nativeResume(mNativeMapViewPtr);
-    }
-
     public void update() {
         nativeUpdate(mNativeMapViewPtr);
     }
 
-    public void renderSync() {
-        nativeRenderSync(mNativeMapViewPtr);
+    public void render() {
+        nativeRender(mNativeMapViewPtr);
     }
 
     public void resizeView(int width, int height) {
@@ -201,34 +189,12 @@ final class NativeMapView {
         return nativeGetClasses(mNativeMapViewPtr);
     }
 
-    public void setDefaultTransitionDuration() {
-        setDefaultTransitionDuration(0);
-    }
-
-    public long getDefaultTransitionDuration() {
-        return nativeGetDefaultTransitionDuration(mNativeMapViewPtr);
-    }
-
-    public void setDefaultTransitionDuration(long milliseconds) {
-        if (milliseconds < 0) {
-            throw new IllegalArgumentException(
-                    "milliseconds cannot be negative.");
-        }
-
-        nativeSetDefaultTransitionDuration(mNativeMapViewPtr,
-                milliseconds);
-    }
-
     public void setStyleUrl(String url) {
         nativeSetStyleUrl(mNativeMapViewPtr, url);
     }
 
     public void setStyleJson(String newStyleJson) {
-        setStyleJson(newStyleJson, "");
-    }
-
-    public void setStyleJson(String newStyleJson, String base) {
-        nativeSetStyleJson(mNativeMapViewPtr, newStyleJson, base);
+        nativeSetStyleJson(mNativeMapViewPtr, newStyleJson);
     }
 
     public String getStyleJson() {
@@ -377,27 +343,30 @@ final class NativeMapView {
     }
 
     public long addMarker(Marker marker) {
-        return nativeAddMarker(mNativeMapViewPtr, marker);
+        Marker[] markers = { marker };
+        return nativeAddMarkers(mNativeMapViewPtr, markers)[0];
     }
 
     public long[] addMarkers(List<Marker> markers) {
-        return nativeAddMarkers(mNativeMapViewPtr, markers);
+        return nativeAddMarkers(mNativeMapViewPtr, markers.toArray(new Marker[markers.size()]));
     }
 
     public long addPolyline(Polyline polyline) {
-        return nativeAddPolyline(mNativeMapViewPtr, polyline);
+        Polyline[] polylines = { polyline };
+        return nativeAddPolylines(mNativeMapViewPtr, polylines)[0];
     }
 
     public long[] addPolylines(List<Polyline> polylines) {
-        return nativeAddPolylines(mNativeMapViewPtr, polylines);
+        return nativeAddPolylines(mNativeMapViewPtr, polylines.toArray(new Polyline[polylines.size()]));
     }
 
     public long addPolygon(Polygon polygon) {
-        return nativeAddPolygon(mNativeMapViewPtr, polygon);
+        Polygon[] polygons = { polygon };
+        return nativeAddPolygons(mNativeMapViewPtr, polygons)[0];
     }
 
-    public long[] addPolygons(List<Polygon> polygon) {
-        return nativeAddPolygons(mNativeMapViewPtr, polygon);
+    public long[] addPolygons(List<Polygon> polygons) {
+        return nativeAddPolygons(mNativeMapViewPtr, polygons.toArray(new Polygon[polygons.size()]));
     }
 
     public void updateMarker(Marker marker) {
@@ -405,7 +374,8 @@ final class NativeMapView {
     }
 
     public void removeAnnotation(long id) {
-        nativeRemoveAnnotation(mNativeMapViewPtr, id);
+        long[] ids = { id };
+        removeAnnotations(ids);
     }
 
     public void removeAnnotations(long[] ids) {
@@ -476,8 +446,8 @@ final class NativeMapView {
         nativeJumpTo(mNativeMapViewPtr, angle, center, pitch, zoom);
     }
 
-    public void easeTo(double angle, LatLng center, long duration, double pitch, double zoom) {
-        nativeEaseTo(mNativeMapViewPtr, angle, center, duration, pitch, zoom);
+    public void easeTo(double angle, LatLng center, long duration, double pitch, double zoom, boolean easingInterpolator) {
+        nativeEaseTo(mNativeMapViewPtr, angle, center, duration, pitch, zoom, easingInterpolator);
     }
 
     public void flyTo(double angle, LatLng center, long duration, double pitch, double zoom) {
@@ -533,15 +503,9 @@ final class NativeMapView {
 
     private native void nativeDestroySurface(long nativeMapViewPtr);
 
-    private native void nativePause(long nativeMapViewPtr);
-
-    private native boolean nativeIsPaused(long nativeMapViewPtr);
-
-    private native void nativeResume(long nativeMapViewPtr);
-
     private native void nativeUpdate(long nativeMapViewPtr);
 
-    private native void nativeRenderSync(long nativeMapViewPtr);
+    private native void nativeRender(long nativeMapViewPtr);
 
     private native void nativeViewResize(long nativeMapViewPtr, int width, int height);
 
@@ -558,15 +522,9 @@ final class NativeMapView {
 
     private native List<String> nativeGetClasses(long nativeMapViewPtr);
 
-    private native void nativeSetDefaultTransitionDuration(
-            long nativeMapViewPtr, long duration);
-
-    private native long nativeGetDefaultTransitionDuration(long nativeMapViewPtr);
-
     private native void nativeSetStyleUrl(long nativeMapViewPtr, String url);
 
-    private native void nativeSetStyleJson(long nativeMapViewPtr,
-                                           String newStyleJson, String base);
+    private native void nativeSetStyleJson(long nativeMapViewPtr, String newStyleJson);
 
     private native String nativeGetStyleJson(long nativeMapViewPtr);
 
@@ -630,21 +588,13 @@ final class NativeMapView {
 
     private native void nativeResetNorth(long nativeMapViewPtr);
 
-    private native long nativeAddMarker(long nativeMapViewPtr, Marker marker);
-
     private native void nativeUpdateMarker(long nativeMapViewPtr, Marker marker);
 
-    private native long[] nativeAddMarkers(long nativeMapViewPtr, List<Marker> markers);
-
-    private native long nativeAddPolyline(long nativeMapViewPtr, Polyline polyline);
-
-    private native long[] nativeAddPolylines(long mNativeMapViewPtr, List<Polyline> polygon);
-
-    private native long nativeAddPolygon(long mNativeMapViewPtr, Polygon polygon);
+    private native long[] nativeAddMarkers(long nativeMapViewPtr, Marker[] markers);
 
-    private native long[] nativeAddPolygons(long mNativeMapViewPtr, List<Polygon> polygon);
+    private native long[] nativeAddPolylines(long mNativeMapViewPtr, Polyline[] polylines);
 
-    private native void nativeRemoveAnnotation(long nativeMapViewPtr, long id);
+    private native long[] nativeAddPolygons(long mNativeMapViewPtr, Polygon[] polygons);
 
     private native void nativeRemoveAnnotations(long nativeMapViewPtr, long[] id);
 
@@ -682,7 +632,7 @@ final class NativeMapView {
 
     private native void nativeJumpTo(long nativeMapViewPtr, double angle, LatLng center, double pitch, double zoom);
 
-    private native void nativeEaseTo(long nativeMapViewPtr, double angle, LatLng center, long duration, double pitch, double zoom);
+    private native void nativeEaseTo(long nativeMapViewPtr, double angle, LatLng center, long duration, double pitch, double zoom, boolean easingInterpolator);
 
     private native void nativeFlyTo(long nativeMapViewPtr, double angle, LatLng center, long duration, double pitch, double zoom);