From 98c36fc06edb99b2db20d474c4c3ec6bf51e219d Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Tue, 16 Oct 2018 15:53:27 +0200
Subject: [PATCH] [core] CameraOptions receives and outputs angle and pitch as
 degrees, not radians

---
 include/mbgl/map/camera.hpp                   |   5 ++---
 platform/android/src/map/camera_position.cpp  |   6 +++---
 platform/android/src/native_map_view.cpp      |  15 +++++++--------
 platform/darwin/src/MGLMapSnapshotter.mm      |   2 +-
 platform/ios/src/MGLMapView.mm                |   4 ++--
 platform/node/src/node_map.cpp                |   4 ++--
 platform/qt/src/qmapboxgl.cpp                 |   4 ++--
 src/mbgl/map/map.cpp                          |   4 ++--
 src/mbgl/map/transform.cpp                    |  14 +++++++-------
 .../offline_database/offline_sideload.db      | Bin 4096 -> 73728 bytes
 test/map/map.test.cpp                         |  16 ++++++++--------
 11 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp
index 53b5b590b..33722a001 100644
--- a/include/mbgl/map/camera.hpp
+++ b/include/mbgl/map/camera.hpp
@@ -27,11 +27,10 @@ struct CameraOptions {
         levels. */
     optional<double> zoom;
 
-    /** Bearing, measured in radians counterclockwise from true north. Wrapped
-        to [−π rad, π rad). */
+    /** Bearing, measured in degrees from true north. Wrapped to [0, 360). */
     optional<double> angle;
 
-    /** Pitch toward the horizon measured in radians, with 0 rad resulting in a
+    /** Pitch toward the horizon measured in degrees , with 0 deg resulting in a
         two-dimensional map. */
     optional<double> pitch;
 };
diff --git a/platform/android/src/map/camera_position.cpp b/platform/android/src/map/camera_position.cpp
index 3caf4ea2f..6c7b78c10 100644
--- a/platform/android/src/map/camera_position.cpp
+++ b/platform/android/src/map/camera_position.cpp
@@ -14,7 +14,7 @@ jni::Local<jni::Object<CameraPosition>> CameraPosition::New(jni::JNIEnv &env, mb
 
     // convert bearing, measured in radians counterclockwise from true north.
     // Wrapped to [−π rad, π rad). Android binding from 0 to 360 degrees
-    double bearing_degrees = -options.angle.value_or(0) * util::RAD2DEG;
+    double bearing_degrees = options.angle.value_or(0);
     while (bearing_degrees > 360) {
         bearing_degrees -= 360;
     }
@@ -23,7 +23,7 @@ jni::Local<jni::Object<CameraPosition>> CameraPosition::New(jni::JNIEnv &env, mb
     }
 
     // convert tilt, core ranges from  [0 rad, 1,0472 rad], android ranges from 0 to 60
-    double tilt_degrees = options.pitch.value_or(0) * util::RAD2DEG;
+    double tilt_degrees = options.pitch.value_or(0);
 
     return javaClass.New(env, constructor, LatLng::New(env, center), options.zoom.value_or(0), tilt_degrees, bearing_degrees);
 }
@@ -42,7 +42,7 @@ mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, const jni
             {},
             {},
             position.Get(env, zoom),
-            position.Get(env, bearing) * util::DEG2RAD,
+            position.Get(env, bearing),
             position.Get(env, tilt)
     };
 }
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index 7b22e1e81..f12c48f93 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -257,12 +257,12 @@ void NativeMapView::moveBy(jni::JNIEnv&, jni::jdouble dx, jni::jdouble dy, jni::
 void NativeMapView::jumpTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitude, jni::jdouble longitude, jni::jdouble pitch, jni::jdouble zoom) {
     mbgl::CameraOptions options;
     if (angle != -1) {
-        options.angle = -angle * util::DEG2RAD;
+        options.angle = angle;
     }
     options.center = mbgl::LatLng(latitude, longitude);
     options.padding = insets;
     if (pitch != -1) {
-        options.pitch = pitch * util::DEG2RAD;
+        options.pitch = pitch;
     }
     if (zoom != -1) {
         options.zoom = zoom;
@@ -274,12 +274,12 @@ void NativeMapView::jumpTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitu
 void NativeMapView::easeTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitude, jni::jdouble longitude, jni::jlong duration, jni::jdouble pitch, jni::jdouble zoom, jni::jboolean easing) {
     mbgl::CameraOptions cameraOptions;
     if (angle != -1) {
-        cameraOptions.angle = -angle * util::DEG2RAD;
+        cameraOptions.angle = angle;
     }
     cameraOptions.center = mbgl::LatLng(latitude, longitude);
     cameraOptions.padding = insets;
     if (pitch != -1) {
-        cameraOptions.pitch = pitch * util::DEG2RAD;
+        cameraOptions.pitch = pitch;
     }
     if (zoom != -1) {
         cameraOptions.zoom = zoom;
@@ -298,12 +298,12 @@ void NativeMapView::easeTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitu
 void NativeMapView::flyTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitude, jni::jdouble longitude, jni::jlong duration, jni::jdouble pitch, jni::jdouble zoom) {
     mbgl::CameraOptions cameraOptions;
     if (angle != -1) {
-        cameraOptions.angle = -angle * util::DEG2RAD;
+        cameraOptions.angle = angle;
     }
     cameraOptions.center = mbgl::LatLng(latitude, longitude);
     cameraOptions.padding = insets;
     if (pitch != -1) {
-        cameraOptions.pitch = pitch * util::DEG2RAD;
+        cameraOptions.pitch = pitch;
     }
     if (zoom != -1) {
         cameraOptions.zoom = zoom;
@@ -416,8 +416,7 @@ void NativeMapView::setVisibleCoordinateBounds(JNIEnv& env, const jni::Array<jni
     mbgl::EdgeInsets mbglInsets = { RectF::getTop(env, padding), RectF::getLeft(env, padding), RectF::getBottom(env, padding), RectF::getRight(env, padding) };
     mbgl::CameraOptions cameraOptions = map->cameraForLatLngs(latLngs, mbglInsets);
     if (direction >= 0) {
-        // convert from degrees to radians
-        cameraOptions.angle = (-direction * M_PI) / 180;
+        cameraOptions.angle = direction;
     }
 
     mbgl::AnimationOptions animationOptions;
diff --git a/platform/darwin/src/MGLMapSnapshotter.mm b/platform/darwin/src/MGLMapSnapshotter.mm
index aa1a988b1..590c38714 100644
--- a/platform/darwin/src/MGLMapSnapshotter.mm
+++ b/platform/darwin/src/MGLMapSnapshotter.mm
@@ -550,7 +550,7 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64;
     if (CLLocationCoordinate2DIsValid(options.camera.centerCoordinate)) {
         cameraOptions.center = MGLLatLngFromLocationCoordinate2D(options.camera.centerCoordinate);
     }
-    cameraOptions.angle = MAX(0, options.camera.heading) * mbgl::util::DEG2RAD;
+    cameraOptions.angle = MAX(0, options.camera.heading);
     cameraOptions.zoom = MAX(0, options.zoomLevel);
     cameraOptions.pitch = MAX(0, options.camera.pitch);
     
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 7096c55a8..0e9563629 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -1970,7 +1970,7 @@ public:
     MGLMapCamera *camera;
     
     mbgl::ScreenCoordinate anchor = mbgl::ScreenCoordinate { anchorPoint.x, anchorPoint.y };
-    currentCameraOptions.angle = degrees * mbgl::util::DEG2RAD;
+    currentCameraOptions.angle = degrees;
     currentCameraOptions.anchor = anchor;
     camera = [self cameraForCameraOptions:currentCameraOptions];
     
@@ -1984,7 +1984,7 @@ public:
     
     MGLMapCamera *camera;
 
-    currentCameraOptions.pitch = pitch * mbgl::util::DEG2RAD;
+    currentCameraOptions.pitch = pitch;
     camera = [self cameraForCameraOptions:currentCameraOptions];
     
     return camera;
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index e32c576e1..5693edbd0 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -443,8 +443,8 @@ void NodeMap::startRender(NodeMap::RenderOptions options) {
     mbgl::CameraOptions camera;
     camera.center = mbgl::LatLng { options.latitude, options.longitude };
     camera.zoom = options.zoom;
-    camera.angle = -options.bearing * mbgl::util::DEG2RAD;
-    camera.pitch = options.pitch * mbgl::util::DEG2RAD;
+    camera.angle = options.bearing;
+    camera.pitch = options.pitch;
 
     if (map->getAxonometric() != options.axonometric) {
         map->setAxonometric(options.axonometric);
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index e1fe7f5a3..ceed411ca 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -808,10 +808,10 @@ void QMapboxGL::jumpTo(const QMapboxGLCameraOptions& camera)
         mbglCamera.zoom = camera.zoom.value<double>();
     }
     if (camera.angle.isValid()) {
-        mbglCamera.angle = -camera.angle.value<double>() * mbgl::util::DEG2RAD;
+        mbglCamera.angle = camera.angle.value<double>();
     }
     if (camera.pitch.isValid()) {
-        mbglCamera.pitch = camera.pitch.value<double>() * mbgl::util::DEG2RAD;
+        mbglCamera.pitch = camera.pitch.value<double>();
     }
 
     mbglCamera.padding = d_ptr->margins;
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 9d886cb74..1f64cf3ac 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -450,8 +450,8 @@ CameraOptions Map::cameraForLatLngs(const std::vector<LatLng>& latLngs, const Ed
     }
     
     CameraOptions options = mbgl::cameraForLatLngs(latLngs, transform, padding);
-    options.angle = transform.getAngle();
-    options.pitch = transform.getPitch();
+    options.angle = -transform.getAngle() * util::RAD2DEG;
+    options.pitch = transform.getPitch() * util::RAD2DEG;
     
     return options;
 }
diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp
index da8e243d9..21f1b70c4 100644
--- a/src/mbgl/map/transform.cpp
+++ b/src/mbgl/map/transform.cpp
@@ -91,8 +91,8 @@ void Transform::easeTo(const CameraOptions& camera, const AnimationOptions& anim
     const LatLng unwrappedLatLng = camera.center.value_or(getLatLng());
     const LatLng latLng = unwrappedLatLng.wrapped();
     double zoom = camera.zoom.value_or(getZoom());
-    double angle = camera.angle.value_or(getAngle());
-    double pitch = camera.pitch.value_or(getPitch());
+    double angle = camera.angle ? -*camera.angle * util::DEG2RAD : getAngle();
+    double pitch = camera.pitch ? *camera.pitch * util::DEG2RAD : getPitch();
 
     if (std::isnan(zoom)) {
         return;
@@ -164,8 +164,8 @@ void Transform::easeTo(const CameraOptions& camera, const AnimationOptions& anim
 void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &animation) {
     const LatLng latLng = camera.center.value_or(getLatLng()).wrapped();
     double zoom = camera.zoom.value_or(getZoom());
-    double angle = camera.angle.value_or(getAngle());
-    double pitch = camera.pitch.value_or(getPitch());
+    double angle = camera.angle ? -*camera.angle * util::DEG2RAD : getAngle();
+    double pitch = camera.pitch ? *camera.pitch * util::DEG2RAD : getPitch();
 
     if (std::isnan(zoom) || state.size.isEmpty()) {
         return;
@@ -451,7 +451,7 @@ void Transform::rotateBy(const ScreenCoordinate& first, const ScreenCoordinate&
     }
 
     CameraOptions camera;
-    camera.angle = state.angle + util::angle_between(first - center, second - center);
+    camera.angle = -(state.angle + util::angle_between(first - center, second - center)) * util::RAD2DEG;
     easeTo(camera, animation);
 }
 
@@ -462,7 +462,7 @@ void Transform::setAngle(double angle, const AnimationOptions& animation) {
 void Transform::setAngle(double angle, optional<ScreenCoordinate> anchor, const AnimationOptions& animation) {
     if (std::isnan(angle)) return;
     CameraOptions camera;
-    camera.angle = angle;
+    camera.angle = -angle * util::RAD2DEG;
     camera.anchor = anchor;
     easeTo(camera, animation);
 }
@@ -486,7 +486,7 @@ void Transform::setPitch(double pitch, const AnimationOptions& animation) {
 void Transform::setPitch(double pitch, optional<ScreenCoordinate> anchor, const AnimationOptions& animation) {
     if (std::isnan(pitch)) return;
     CameraOptions camera;
-    camera.pitch = pitch;
+    camera.pitch = pitch * util::RAD2DEG;
     camera.anchor = anchor;
     easeTo(camera, animation);
 }
diff --git a/test/fixtures/offline_database/offline_sideload.db b/test/fixtures/offline_database/offline_sideload.db
index 8909c402b226547ece61086b4460889329da7d58..6146e30872853f935e585afb96ca03abc3927514 100644
GIT binary patch
literal 73728
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
AB>(^b

delta 3291
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
Z<gCHA1)$nR<8_FJir03oUMeoa=i%rEEp-3@

diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp
index cb45c2900..88ddfa6ce 100644
--- a/test/map/map.test.cpp
+++ b/test/map/map.test.cpp
@@ -81,10 +81,10 @@ TEST(Map, LatLngBoundsToCameraWithAngle) {
 
     LatLngBounds bounds = LatLngBounds::hull({15.68169,73.499857}, {53.560711, 134.77281});
 
-    CameraOptions virtualCamera = test.map.cameraForLatLngBounds(bounds, {}, 35);
+    CameraOptions virtualCamera = test.map.cameraForLatLngBounds(bounds, {}, 35.0);
     ASSERT_TRUE(bounds.contains(*virtualCamera.center));
     EXPECT_NEAR(*virtualCamera.zoom, 1.21385, 1e-5);
-    EXPECT_NEAR(virtualCamera.angle.value_or(0), -35 * util::DEG2RAD, 1e-5);
+    EXPECT_NEAR(virtualCamera.angle.value_or(0), 35.0, 1e-5);
 }
 
 TEST(Map, LatLngBoundsToCameraWithAngleAndPitch) {
@@ -97,8 +97,8 @@ TEST(Map, LatLngBoundsToCameraWithAngleAndPitch) {
     CameraOptions virtualCamera = test.map.cameraForLatLngBounds(bounds, {}, 35, 20);
     ASSERT_TRUE(bounds.contains(*virtualCamera.center));
     EXPECT_NEAR(*virtualCamera.zoom, 13.66272, 1e-5);
-    ASSERT_DOUBLE_EQ(*virtualCamera.pitch, 20 * util::DEG2RAD);
-    EXPECT_NEAR(virtualCamera.angle.value_or(0), -35 * util::DEG2RAD, 1e-5);
+    ASSERT_DOUBLE_EQ(*virtualCamera.pitch, 20.0);
+    EXPECT_NEAR(virtualCamera.angle.value_or(0), 35.0, 1e-5);
 }
 
 TEST(Map, LatLngsToCamera) {
@@ -106,8 +106,8 @@ TEST(Map, LatLngsToCamera) {
 
     std::vector<LatLng> latLngs{{ 40.712730, 74.005953 }, {15.68169,73.499857}, {30.82678, 83.4082}};
 
-    CameraOptions virtualCamera = test.map.cameraForLatLngs(latLngs, {}, 23);
-    EXPECT_NEAR(virtualCamera.angle.value_or(0), -23 * util::DEG2RAD, 1e-5);
+    CameraOptions virtualCamera = test.map.cameraForLatLngs(latLngs, {}, 23.0);
+    EXPECT_NEAR(virtualCamera.angle.value_or(0), 23.0, 1e-5);
     EXPECT_NEAR(virtualCamera.zoom.value_or(0), 2.75434, 1e-5);
     EXPECT_NEAR(virtualCamera.center->latitude(), 28.49288, 1e-5);
     EXPECT_NEAR(virtualCamera.center->longitude(), 74.97437, 1e-5);
@@ -119,11 +119,11 @@ TEST(Map, LatLngsToCameraWithAngleAndPitch) {
     std::vector<LatLng> latLngs{{ 40.712730, 74.005953 }, {15.68169,73.499857}, {30.82678, 83.4082}};
     
     CameraOptions virtualCamera = test.map.cameraForLatLngs(latLngs, {}, 23, 20);
-    EXPECT_NEAR(virtualCamera.angle.value_or(0), -23 * util::DEG2RAD, 1e-5);
+    EXPECT_NEAR(virtualCamera.angle.value_or(0), 23.0, 1e-5);
     EXPECT_NEAR(virtualCamera.zoom.value_or(0), 3.04378, 1e-5);
     EXPECT_NEAR(virtualCamera.center->latitude(), 28.53718, 1e-5);
     EXPECT_NEAR(virtualCamera.center->longitude(), 74.31746, 1e-5);
-    ASSERT_DOUBLE_EQ(*virtualCamera.pitch, 20 * util::DEG2RAD);
+    ASSERT_DOUBLE_EQ(*virtualCamera.pitch, 20.0);
 }