Cherry pick latlngbounds to release branch (#8788)

* [android] - move calculation of LatLngBounds to core

* [core] Ignore shortest path in Map::pixelForLatLng

* [android] - convert camera position values coming from core (#8794)

15 files changed, 167 insertions, 161 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
index a8fc58d51c..5e958ff565 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
@@ -232,24 +232,6 @@ public final class CameraPosition implements Parcelable {
     }
 
     /**
-     * Create Builder from an existing array of doubles.
-     * <p>
-     * These values conform to map.ccp representation of a camera position.
-     * </p>
-     *
-     * @param nativeCameraValues Values containing target, bearing, tilt and zoom
-     */
-    public Builder(double[] nativeCameraValues) {
-      super();
-      if (nativeCameraValues != null && nativeCameraValues.length == 5) {
-        target(new LatLng(nativeCameraValues[0], nativeCameraValues[1]).wrap());
-        bearing(MathUtils.convertNativeBearing(nativeCameraValues[2]));
-        tilt(nativeCameraValues[3]);
-        zoom(nativeCameraValues[4]);
-      }
-    }
-
-    /**
      * Sets the direction that the camera is pointing in, in degrees clockwise from north.
      *
      * @param bearing Bearing
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java
index ef8a4d58e8..64b86054a0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java
@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.camera;
 
 import android.graphics.Point;
 import android.graphics.PointF;
-import android.graphics.RectF;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 
@@ -11,7 +10,6 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.Projection;
 import com.mapbox.mapboxsdk.maps.UiSettings;
-import com.mapbox.services.android.telemetry.utils.MathUtils;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -199,17 +197,13 @@ public final class CameraUpdateFactory {
   static final class CameraBoundsUpdate implements CameraUpdate {
 
     private LatLngBounds bounds;
-    private RectF padding;
+    private int[] padding;
 
-    CameraBoundsUpdate(LatLngBounds bounds, RectF padding) {
+    CameraBoundsUpdate(LatLngBounds bounds, int[] padding) {
       this.bounds = bounds;
       this.padding = padding;
     }
 
-    CameraBoundsUpdate(LatLngBounds bounds, int[] padding) {
-      this(bounds, new RectF(padding[0], padding[1], padding[2], padding[3]));
-    }
-
     CameraBoundsUpdate(LatLngBounds bounds, int paddingLeft, int paddingTop, int paddingRight, int paddingBottom) {
       this(bounds, new int[] {paddingLeft, paddingTop, paddingRight, paddingBottom});
     }
@@ -218,64 +212,13 @@ public final class CameraUpdateFactory {
       return bounds;
     }
 
-    public RectF getPadding() {
+    public int[] getPadding() {
       return padding;
     }
 
     @Override
     public CameraPosition getCameraPosition(@NonNull MapboxMap mapboxMap) {
-      // Get required objects
-      Projection projection = mapboxMap.getProjection();
-      UiSettings uiSettings = mapboxMap.getUiSettings();
-
-      // calculate correct padding
-      int[] mapPadding = mapboxMap.getPadding();
-      RectF latLngPadding = getPadding();
-      RectF padding = new RectF(latLngPadding.left + mapPadding[0],
-        latLngPadding.top + mapPadding[1],
-        latLngPadding.right + mapPadding[2],
-        latLngPadding.bottom + mapPadding[3]);
-
-      // Calculate the bounds of the possibly rotated shape with respect to the viewport
-      PointF nePixel = new PointF(-Float.MAX_VALUE, -Float.MAX_VALUE);
-      PointF swPixel = new PointF(Float.MAX_VALUE, Float.MAX_VALUE);
-      float viewportHeight = uiSettings.getHeight();
-      for (LatLng latLng : getBounds().toLatLngs()) {
-        PointF pixel = projection.toScreenLocation(latLng);
-        swPixel.x = Math.min(swPixel.x, pixel.x);
-        nePixel.x = Math.max(nePixel.x, pixel.x);
-        swPixel.y = Math.min(swPixel.y, viewportHeight - pixel.y);
-        nePixel.y = Math.max(nePixel.y, viewportHeight - pixel.y);
-      }
-
-      // Calculate width/height
-      float width = nePixel.x - swPixel.x;
-      float height = nePixel.y - swPixel.y;
-
-      double zoom = 0;
-      float minScale = 1;
-      // Calculate the zoom level
-      if (padding != null) {
-        float scaleX = (uiSettings.getWidth() - padding.left - padding.right) / width;
-        float scaleY = (uiSettings.getHeight() - padding.top - padding.bottom) / height;
-        minScale = scaleX < scaleY ? scaleX : scaleY;
-        zoom = projection.calculateZoom(minScale);
-        zoom = MathUtils.clamp(zoom, mapboxMap.getMinZoomLevel(), mapboxMap.getMaxZoomLevel());
-      }
-
-      // Calculate the center point
-      PointF paddedNEPixel = new PointF(nePixel.x + padding.right / minScale, nePixel.y + padding.top / minScale);
-      PointF paddedSWPixel = new PointF(swPixel.x - padding.left / minScale, swPixel.y - padding.bottom / minScale);
-      PointF centerPixel = new PointF((paddedNEPixel.x + paddedSWPixel.x) / 2, (paddedNEPixel.y + paddedSWPixel.y) / 2);
-      centerPixel.y = viewportHeight - centerPixel.y;
-      LatLng center = projection.fromScreenLocation(centerPixel);
-
-      return new CameraPosition.Builder()
-        .target(center)
-        .zoom(zoom)
-        .tilt(0)
-        .bearing(0)
-        .build();
+      return mapboxMap.getCameraForLatLngBounds(bounds, padding);
     }
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 6edae8b944..e7679a4066 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -36,6 +36,7 @@ import com.mapbox.mapboxsdk.constants.MyBearingTracking;
 import com.mapbox.mapboxsdk.constants.MyLocationTracking;
 import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings;
 import com.mapbox.mapboxsdk.style.layers.Filter;
 import com.mapbox.mapboxsdk.style.layers.Layer;
@@ -1505,6 +1506,32 @@ public final class MapboxMap {
   }
 
   //
+  // LatLngBounds
+  //
+
+
+  /**
+   * Gets a camera position that would fit a bounds.
+   *
+   * @param latLngBounds the bounds to constrain the map with
+   */
+  public CameraPosition getCameraForLatLngBounds(@Nullable LatLngBounds latLngBounds, int[] padding) {
+    // calculate and set additional bounds padding
+    int[] mapPadding = getPadding();
+    for (int i = 0; i < padding.length; i++) {
+      padding[i] = mapPadding[i] + padding[i];
+    }
+    projection.setContentPadding(padding, myLocationViewSettings.getPadding());
+
+    // get padded camera position from LatLngBounds
+    CameraPosition cameraPosition = nativeMapView.getCameraForLatLngBounds(latLngBounds);
+
+    // reset map padding
+    setPadding(mapPadding);
+    return cameraPosition;
+  }
+
+  //
   // Padding
   //
 
@@ -1527,7 +1554,11 @@ public final class MapboxMap {
    * @param bottom The bottom margin in pixels.
    */
   public void setPadding(int left, int top, int right, int bottom) {
-    projection.setContentPadding(new int[] {left, top, right, bottom}, myLocationViewSettings.getPadding());
+    setPadding(new int[] {left, top, right, bottom});
+  }
+
+  private void setPadding(int[] padding) {
+    projection.setContentPadding(padding, myLocationViewSettings.getPadding());
     uiSettings.invalidate();
   }
 
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 a9394d0b66..fae6311a03 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
@@ -17,8 +17,10 @@ import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.Polygon;
 import com.mapbox.mapboxsdk.annotations.Polyline;
+import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.geometry.ProjectedMeters;
 import com.mapbox.mapboxsdk.storage.FileSource;
 import com.mapbox.mapboxsdk.style.layers.CannotAddLayerException;
@@ -309,6 +311,13 @@ final class NativeMapView {
     return nativeGetLatLng().wrap();
   }
 
+  public CameraPosition getCameraForLatLngBounds(LatLngBounds latLngBounds) {
+    if (isDestroyedOn("getCameraForLatLngBounds")) {
+      return null;
+    }
+    return nativeGetCameraForLatLngBounds(latLngBounds);
+  }
+
   public void resetPosition() {
     if (isDestroyedOn("resetPosition")) {
       return;
@@ -717,11 +726,11 @@ final class NativeMapView {
     nativeFlyTo(angle, center.getLatitude(), center.getLongitude(), duration, pitch, zoom);
   }
 
-  public double[] getCameraValues() {
+  public CameraPosition getCameraPosition() {
     if (isDestroyedOn("getCameraValues")) {
-      return new double[] {};
+      return new CameraPosition.Builder().build();
     }
-    return nativeGetCameraValues();
+    return nativeGetCameraPosition();
   }
 
   // Runtime style Api
@@ -1005,6 +1014,8 @@ final class NativeMapView {
 
   private native LatLng nativeGetLatLng();
 
+  private native CameraPosition nativeGetCameraForLatLngBounds(LatLngBounds latLngBounds);
+
   private native void nativeResetPosition();
 
   private native double nativeGetPitch();
@@ -1095,7 +1106,7 @@ final class NativeMapView {
   private native void nativeFlyTo(double angle, double latitude, double longitude,
                                   long duration, double pitch, double zoom);
 
-  private native double[] nativeGetCameraValues();
+  private native CameraPosition nativeGetCameraPosition();
 
   private native long nativeGetTransitionDuration();
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
index ec4b903a74..15e0fb8925 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
@@ -135,7 +135,7 @@ final class Transform implements MapView.OnMapChangedListener {
   @Nullable
   CameraPosition invalidateCameraPosition() {
     if (mapView != null) {
-      cameraPosition = new CameraPosition.Builder(mapView.getCameraValues()).build();
+      cameraPosition = mapView.getCameraPosition();
       if (onCameraChangeListener != null) {
         onCameraChangeListener.onCameraChange(this.cameraPosition);
       }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
index 5c9cf93ebc..a0d9646915 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
@@ -110,8 +110,7 @@ public final class CompassView extends AppCompatImageView implements Runnable, F
    * @param bearing the direction value of the map
    */
   public void update(final double bearing) {
-    // compass needs reverse bearing #8123
-    rotation = (float) -bearing;
+    rotation = (float) bearing;
 
     if (!isEnabled()) {
       return;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
index 5c33f3f168..ba861131a2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
@@ -1,9 +1,11 @@
 package com.mapbox.mapboxsdk.testapp.activity.camera;
 
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
 
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
+import com.mapbox.mapboxsdk.camera.CameraUpdate;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.geometry.LatLng;
@@ -11,14 +13,8 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.maps.UiSettings;
 import com.mapbox.mapboxsdk.testapp.R;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import timber.log.Timber;
-
 /**
  * Test activity showcasing using the LatLngBounds camera API.
  * <p>
@@ -31,6 +27,9 @@ public class LatLngBoundsActivity extends AppCompatActivity implements OnMapRead
   private static final LatLng LOS_ANGELES = new LatLng(34.053940, -118.242622);
   private static final LatLng NEW_YORK = new LatLng(40.712730, -74.005953);
 
+  private final LatLng CHINA_BOTTOM_LEFT = new LatLng(15.68169, 73.499857);
+  private final LatLng CHINA_TOP_RIGHT = new LatLng(53.560711, 134.77281);
+
   private MapView mapView;
   private MapboxMap mapboxMap;
 
@@ -46,41 +45,31 @@ public class LatLngBoundsActivity extends AppCompatActivity implements OnMapRead
   }
 
   @Override
-  public void onMapReady(MapboxMap map) {
+  public void onMapReady(final MapboxMap map) {
     mapboxMap = map;
-    UiSettings uiSettings = mapboxMap.getUiSettings();
-    uiSettings.setAllGesturesEnabled(false);
-
-    mapboxMap.addMarker(new MarkerOptions()
-      .title("Los Angeles")
-      .snippet("City Hall")
-      .position(LOS_ANGELES));
-
-    mapboxMap.addMarker(new MarkerOptions()
-      .title("New York")
-      .snippet("City Hall")
-      .position(NEW_YORK));
-
-    List<LatLng> points = new ArrayList<>();
-    points.add(NEW_YORK);
-    points.add(LOS_ANGELES);
-
-    // Create Bounds
-    final LatLngBounds bounds = new LatLngBounds.Builder()
-      .includes(points)
-      .build();
-
-    // Add map padding
-    int mapPadding = (int) getResources().getDimension(R.dimen.fab_margin);
-    mapboxMap.setPadding(mapPadding, mapPadding, mapPadding, mapPadding);
-
-    // Move camera to the bounds with added padding
-    int padding = (int) getResources().getDimension(R.dimen.coordinatebounds_margin);
-    mapboxMap.animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, padding), 1500);
-
-    // Log data
-    Timber.e("Move to bounds: " + bounds.toString());
-    Timber.e("Resulting bounds:" + mapboxMap.getProjection().getVisibleRegion().latLngBounds.toString());
+    moveToBounds(new LatLngBounds.Builder().include(NEW_YORK).include(LOS_ANGELES).build(), new int[] {0, 0, 0, 0});
+    new Handler().postDelayed(new Runnable() {
+      @Override
+      public void run() {
+        moveToBounds(new LatLngBounds.Builder().include(CHINA_BOTTOM_LEFT).include(CHINA_TOP_RIGHT).build(),
+          new int[] {100, 100, 100, 100 });
+      }
+    }, 5000);
+  }
+
+  private void moveToBounds(LatLngBounds latLngBounds, int[] padding) {
+    mapboxMap.clear();
+    mapboxMap.addMarker(new MarkerOptions().position(new LatLng(latLngBounds.getLatNorth(),latLngBounds.getLonEast())));
+    mapboxMap.addMarker(new MarkerOptions().position(new LatLng(latLngBounds.getLatSouth(), latLngBounds.getLonEast())));
+    mapboxMap.addMarker(new MarkerOptions().position(new LatLng(latLngBounds.getLatSouth(), latLngBounds.getLonWest())));
+    mapboxMap.addMarker(new MarkerOptions().position(new LatLng(latLngBounds.getLatNorth(), latLngBounds.getLonWest())));
+    CameraUpdate update =
+      CameraUpdateFactory.newLatLngBounds(latLngBounds,
+        padding[0],
+        padding[1],
+        padding[2],
+        padding[3]);
+    mapboxMap.moveCamera(update);
   }
 
   @Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
index b3eace7856..0c5f3a4be2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
@@ -61,22 +61,6 @@ public class CameraPositionTest {
   }
 
   @Test
-  public void testJniBuilder() {
-    double bearing = 180;
-    double zoom = 12;
-    double latitude = 10;
-    double longitude = 11;
-    double tilt = 44;
-
-    double[] cameraVars = new double[]{latitude, longitude, bearing, tilt, zoom};
-    CameraPosition cameraPosition = new CameraPosition.Builder(cameraVars).build();
-    assertEquals("bearing should match", bearing, cameraPosition.bearing, DELTA);
-    assertEquals("latlng should match", new LatLng(latitude, longitude), cameraPosition.target);
-    assertEquals("tilt should match", tilt, cameraPosition.tilt, DELTA);
-    assertEquals("zoom should match", zoom, cameraPosition.zoom, DELTA);
-  }
-
-  @Test
   public void testToString() {
     LatLng latLng = new LatLng(1, 2);
     CameraPosition cameraPosition = new CameraPosition(latLng, 3, 4, 5);
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index 4219f2bdee..52336d7441 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.2'
         classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.1'
     }
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index fdf03b4ec8..c2bc20771d 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -87,6 +87,8 @@ macro(mbgl_platform_core)
         platform/android/src/style/conversion/property_value.hpp
         platform/android/src/style/conversion/types.hpp
         platform/android/src/style/conversion/types_string_values.hpp
+        platform/android/src/map/camera_position.cpp
+        platform/android/src/map/camera_position.hpp
 
         # Style conversion Java -> C++
         platform/android/src/style/android_conversion.hpp
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index bd12cff3fa..a86ae4a695 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -127,6 +127,9 @@ void registerNatives(JavaVM *vm) {
     IdentityStops::registerNative(env);
     IntervalStops::registerNative(env);
 
+    // Map
+    CameraPosition::registerNative(env);
+
     // Connectivity
     ConnectivityListener::registerNative(env);
 
diff --git a/platform/android/src/map/camera_position.cpp b/platform/android/src/map/camera_position.cpp
new file mode 100644
index 0000000000..8d69967014
--- /dev/null
+++ b/platform/android/src/map/camera_position.cpp
@@ -0,0 +1,38 @@
+#include "camera_position.hpp"
+#include "../geometry/lat_lng.hpp"
+
+namespace mbgl {
+namespace android {
+
+jni::Object<CameraPosition> CameraPosition::New(jni::JNIEnv &env, mbgl::CameraOptions options) {
+    static auto constructor = CameraPosition::javaClass.GetConstructor<jni::Object<LatLng>, double, double, double>(env);
+
+    // wrap LatLng values coming from core
+    auto center = options.center.value();
+    center.wrap();
+
+    // convert bearing, core ranges from [−π rad, π rad], android from 0 to 360 degrees
+    double bearing_degrees = options.angle.value_or(0) * 180.0 / M_PI;
+    while (bearing_degrees > 360) {
+        bearing_degrees -= 360;
+    }
+    while (bearing_degrees < 0) {
+        bearing_degrees += 360;
+    }
+
+    // convert tilt, core ranges from  [0 rad, 1,0472 rad], android ranges from 0 to 60
+    double tilt_degrees = options.pitch.value_or(0) * 180 / M_PI;
+
+    return CameraPosition::javaClass.New(env, constructor, LatLng::New(env, center.latitude, center.longitude), options.zoom.value_or(0), tilt_degrees, bearing_degrees);
+}
+
+void CameraPosition::registerNative(jni::JNIEnv &env) {
+    // Lookup the class
+    CameraPosition::javaClass = *jni::Class<CameraPosition>::Find(env).NewGlobalRef(env).release();
+}
+
+jni::Class<CameraPosition> CameraPosition::javaClass;
+
+
+} // namespace android
+} // namespace mb
\ No newline at end of file
diff --git a/platform/android/src/map/camera_position.hpp b/platform/android/src/map/camera_position.hpp
new file mode 100644
index 0000000000..b9f1646cc9
--- /dev/null
+++ b/platform/android/src/map/camera_position.hpp
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/map/camera.hpp>
+
+#include <jni/jni.hpp>
+
+namespace mbgl {
+namespace android {
+
+class CameraPosition : private mbgl::util::noncopyable {
+public:
+
+    static constexpr auto Name() { return "com/mapbox/mapboxsdk/camera/CameraPosition"; };
+
+    static jni::Object<CameraPosition> New(jni::JNIEnv&, mbgl::CameraOptions);
+
+    static jni::Class<CameraPosition> javaClass;
+
+    static void registerNative(jni::JNIEnv&);
+
+};
+
+
+} // namespace android
+} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index 529ea23304..ddd7ba45f8 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -44,6 +44,8 @@
 #include "bitmap.hpp"
 #include "run_loop_impl.hpp"
 #include "java/util.hpp"
+#include "geometry/lat_lng_bounds.hpp"
+#include "map/camera_position.hpp"
 
 namespace mbgl {
 namespace android {
@@ -369,6 +371,10 @@ void NativeMapView::setLatLng(jni::JNIEnv&, jni::jdouble latitude, jni::jdouble
     map->setLatLng(mbgl::LatLng(latitude, longitude), insets, mbgl::AnimationOptions{mbgl::Milliseconds(duration)});
 }
 
+jni::Object<CameraPosition> NativeMapView::getCameraForLatLngBounds(jni::JNIEnv& env, jni::Object<LatLngBounds> jBounds) {
+    return CameraPosition::New(env, map->cameraForLatLngBounds(mbgl::android::LatLngBounds::getLatLngBounds(env, jBounds), insets));
+}
+
 void NativeMapView::setReachability(jni::JNIEnv&, jni::jboolean reachable) {
     if (reachable) {
         mbgl::NetworkStatus::Reachable();
@@ -494,21 +500,8 @@ void NativeMapView::enableFps(jni::JNIEnv&, jni::jboolean enable) {
     fpsEnabled = enable;
 }
 
-jni::Array<jni::jdouble> NativeMapView::getCameraValues(jni::JNIEnv& env) {
-    //Create buffer with values
-    jdouble buf[5];
-    mbgl::LatLng latLng = map->getLatLng(insets);
-    buf[0] = latLng.latitude;
-    buf[1] = latLng.longitude;
-    buf[2] = -map->getBearing();
-    buf[3] = map->getPitch();
-    buf[4] = map->getZoom();
-
-    //Convert to Java array
-    auto output = jni::Array<jni::jdouble>::New(env, 5);
-    jni::SetArrayRegion(env, *output, 0, 5, buf);
-
-    return output;
+jni::Object<CameraPosition> NativeMapView::getCameraPosition(jni::JNIEnv& env) {
+    return CameraPosition::New(env, map->getCameraOptions(insets));
 }
 
 void NativeMapView::updateMarker(jni::JNIEnv& env, jni::jlong markerId, jni::jdouble lat, jni::jdouble lon, jni::String jid) {
@@ -1429,6 +1422,7 @@ void NativeMapView::registerNative(jni::JNIEnv& env) {
             METHOD(&NativeMapView::flyTo, "nativeFlyTo"),
             METHOD(&NativeMapView::getLatLng, "nativeGetLatLng"),
             METHOD(&NativeMapView::setLatLng, "nativeSetLatLng"),
+            METHOD(&NativeMapView::getCameraForLatLngBounds, "nativeGetCameraForLatLngBounds"),
             METHOD(&NativeMapView::setReachability, "nativeSetReachability"),
             METHOD(&NativeMapView::resetPosition, "nativeResetPosition"),
             METHOD(&NativeMapView::getPitch, "nativeGetPitch"),
@@ -1452,7 +1446,7 @@ void NativeMapView::registerNative(jni::JNIEnv& env) {
             METHOD(&NativeMapView::setContentPadding, "nativeSetContentPadding"),
             METHOD(&NativeMapView::scheduleSnapshot, "nativeTakeSnapshot"),
             METHOD(&NativeMapView::enableFps, "nativeSetEnableFps"),
-            METHOD(&NativeMapView::getCameraValues, "nativeGetCameraValues"),
+            METHOD(&NativeMapView::getCameraPosition, "nativeGetCameraPosition"),
             METHOD(&NativeMapView::updateMarker, "nativeUpdateMarker"),
             METHOD(&NativeMapView::addMarkers, "nativeAddMarkers"),
             METHOD(&NativeMapView::setDebug, "nativeSetDebug"),
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
index 08133b85cd..0e2bb3eef6 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -21,6 +21,8 @@
 #include "geometry/projected_meters.hpp"
 #include "style/layers/layers.hpp"
 #include "style/sources/sources.hpp"
+#include "geometry/lat_lng_bounds.hpp"
+#include "map/camera_position.hpp"
 
 #include <string>
 #include <jni.h>
@@ -107,6 +109,8 @@ public:
 
     void setLatLng(jni::JNIEnv&, jni::jdouble, jni::jdouble, jni::jlong);
 
+    jni::Object<CameraPosition> getCameraForLatLngBounds(jni::JNIEnv&, jni::Object<mbgl::android::LatLngBounds>);
+
     void setReachability(jni::JNIEnv&, jni::jboolean);
 
     void resetPosition(jni::JNIEnv&);
@@ -153,7 +157,7 @@ public:
 
     void enableFps(jni::JNIEnv&, jni::jboolean enable);
 
-    jni::Array<jni::jdouble> getCameraValues(jni::JNIEnv&);
+    jni::Object<CameraPosition> getCameraPosition(jni::JNIEnv&);
 
     void updateMarker(jni::JNIEnv&, jni::jlong, jni::jdouble, jni::jdouble, jni::String);