[core] Simplify LatLng::unwrapForShortestPath usage

Simplify LatLng::{wrap,unwrapForShortestPath} code, avoiding duplicated
code between Transform::{latLngToScreenCoordinate,easeTo,flyTo}.

Added unit tests for camera usage in Transform to detect cases like e.g.
crossing the antimeridian as a shortest path between two coordinates.

Transform::flyTo precision loss to be handled in #4298.

1 files changed, 20 insertions, 40 deletions

diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp
index 26245c86ee..29fa7c9eb2 100644
--- a/src/mbgl/map/transform.cpp
+++ b/src/mbgl/map/transform.cpp
@@ -77,27 +77,21 @@ void Transform::jumpTo(const CameraOptions& camera) {
  * not included in `options`.
  */
 void Transform::easeTo(const CameraOptions& camera, const AnimationOptions& animation) {
-    LatLng latLng = camera.center ? *camera.center : getLatLng();
-    double zoom = camera.zoom ? *camera.zoom : getZoom();
-    double angle = camera.angle ? *camera.angle : getAngle();
-    double pitch = camera.pitch ? *camera.pitch : getPitch();
-    
+    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());
+
     if (!latLng || std::isnan(zoom)) {
         return;
     }
-    
+
     // Determine endpoints.
     EdgeInsets padding;
-    if (camera.padding) {
-        padding = *camera.padding;
-    }
-
-    LatLng startLatLng = getLatLng(padding);
+    if (camera.padding) padding = *camera.padding;
+    LatLng startLatLng = getLatLng(padding).wrapped();
     startLatLng.unwrapForShortestPath(latLng);
 
-    // Make sure the end coordinate always remains valid.
-    latLng.wrap();
-
     const ScreenCoordinate startPoint = {
         state.lngX(startLatLng.longitude),
         state.latY(startLatLng.latitude),
@@ -165,10 +159,10 @@ void Transform::easeTo(const CameraOptions& camera, const AnimationOptions& anim
     Where applicable, local variable documentation begins with the associated
     variable or function in van Wijk (2003). */
 void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &animation) {
-    LatLng latLng = camera.center ? *camera.center : getLatLng();
-    double zoom = camera.zoom ? *camera.zoom : getZoom();
-    double angle = camera.angle ? *camera.angle : getAngle();
-    double pitch = camera.pitch ? *camera.pitch : getPitch();
+    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());
 
     if (!latLng || std::isnan(zoom)) {
         return;
@@ -176,16 +170,10 @@ void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &anima
     
     // Determine endpoints.
     EdgeInsets padding;
-    if (camera.padding) {
-        padding = *camera.padding;
-    }
-
-    LatLng startLatLng = getLatLng(padding);
+    if (camera.padding) padding = *camera.padding;
+    LatLng startLatLng = getLatLng(padding).wrapped();
     startLatLng.unwrapForShortestPath(latLng);
 
-    // Make sure the end coordinate always remains valid.
-    latLng.wrap();
-
     const ScreenCoordinate startPoint = {
         state.lngX(startLatLng.longitude),
         state.latY(startLatLng.latitude),
@@ -653,20 +641,12 @@ void Transform::setGestureInProgress(bool inProgress) {
 ScreenCoordinate Transform::latLngToScreenCoordinate(const LatLng& latLng) const {
     if (!latLng) return ScreenCoordinate::null();
 
-    // If the center and point coordinates are not in the same side of the
-    // antimeridian, we need to unwrap the point longitude to make sure it can
-    // still be seen from the visible side of the antimeridian that is opposite
-    // to the center side.
-    double longitude = latLng.longitude;
-    const double centerLng = getLatLng().longitude;
-    if (std::abs(centerLng - latLng.longitude) > std::abs(util::LONGITUDE_MAX)) {
-        if (centerLng > 0 && latLng.longitude < 0) {
-            longitude += util::DEGREES_MAX;
-        } else if (centerLng < 0 && latLng.longitude > 0) {
-            longitude -= util::DEGREES_MAX;
-        }
-    }
-    ScreenCoordinate point = state.latLngToScreenCoordinate({ latLng.latitude, longitude });
+    // If the center and point longitudes are not in the same side of the
+    // antimeridian, we unwrap the point longitude so it would be seen if
+    // e.g. the next antimeridian side is visible.
+    LatLng unwrappedLatLng = latLng.wrapped();
+    unwrappedLatLng.unwrapForShortestPath(getLatLng());
+    ScreenCoordinate point = state.latLngToScreenCoordinate(unwrappedLatLng);
     point.y = state.height - point.y;
     return point;
 }