From 720a0256f50442e50d12e3b251dc6cb9dcc7f484 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Fri, 11 Nov 2016 18:13:25 +0100
Subject: [PATCH] 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
---
 .../main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java   | 2 ++
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java        | 2 +-
 src/mbgl/map/map.cpp                                            | 1 -
 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 fe6792a0a..070d17bca 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 47f53fd5b..97e86199f 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 ff36bd726..57845080f 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);
 }