Default Style Camera on Android (#7019)

* [core] - do not set camera mutated to true when calling Map::getLatLng

* [android] - correctly check if a Map is created without a camera position

3 files changed, 3 insertions, 2 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 fe6792a0a1..070d17bca2 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
@@ -16,6 +16,8 @@ import static com.mapbox.mapboxsdk.utils.MathUtils.convertNativeBearing;
  */
 public final class CameraPosition implements Parcelable {
 
+    public static final CameraPosition DEFAULT = new CameraPosition(new LatLng(), 0, 0, 0);
+
     public static final Parcelable.Creator<CameraPosition> CREATOR
             = new Parcelable.Creator<CameraPosition>() {
         public CameraPosition createFromParcel(Parcel in) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 47f53fd5b5..97e86199fa 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -263,7 +263,7 @@ public class MapView extends FrameLayout {
         mapboxMap.setDebugActive(options.getDebugActive());
 
         CameraPosition position = options.getCamera();
-        if (position != null) {
+        if (!position.equals(CameraPosition.DEFAULT)) {
             mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(position));
             myLocationView.setTilt(position.tilt);
         }
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index ff36bd7264..57845080f4 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -492,7 +492,6 @@ void Map::setLatLng(const LatLng& latLng, optional<ScreenCoordinate> anchor, con
 }
 
 LatLng Map::getLatLng(optional<EdgeInsets> padding) const {
-    impl->cameraMutated = true;
     return impl->transform.getLatLng(padding);
 }