Camera Pan Fix

Sources/MapboxMaps/Foundation/Camera/CameraManager.swift

@@ -399,14 +399,15 @@ public class CameraManager {
      - Parameter pitch: The degrees to adjust the map's tilt by.
      - Parameter zoom: The amount to adjust the camera's zoom level by.
      - Parameter animated: Indicates  whether the camera changes should be animated.
+     - Parameter pitchedDrift: This hack indicates that the calling function wants to simulate drift. Therefore we need to do some additional calculations
      */
-    public func moveCamera(by offset: CGPoint? = nil, rotation: CGFloat? = nil, pitch: CGFloat? = nil, zoom: CGFloat? = nil, animated: Bool = false) {
+    public func moveCamera(by offset: CGPoint? = nil, rotation: CGFloat? = nil, pitch: CGFloat? = nil, zoom: CGFloat? = nil, animated: Bool = false, pitchedDrift: Bool = false) {
         guard let mapView = mapView else {
             assertionFailure("MapView is nil.")
             return
         }
 
-        let centerCoordinate = self.shiftCenterCoordinate(by: offset ?? .zero)
+        let centerCoordinate = self.shiftCenterCoordinate(by: offset ?? .zero, pitchedDrift: pitchedDrift)
 
         var newBearing: CGFloat = 0
         if let angle = rotation {
@@ -454,8 +455,9 @@ public class CameraManager {
     /**
      Return a new center coordinate shifted by a given offset value.
      - Parameter offset: The `CGPoint` value to shift the map's center by.
+     - Parameter pitchedDrift: This hack indicates that the calling function wants to simulate drift. Therefore we need to do some additional calculations
      */
-    func shiftCenterCoordinate(by offset: CGPoint) -> CLLocationCoordinate2D {
+    func shiftCenterCoordinate(by offset: CGPoint, pitchedDrift: Bool = false) -> CLLocationCoordinate2D {
         guard let mapView = mapView else {
             assertionFailure("MapView is nil.")
             return CLLocationCoordinate2D(latitude: 0, longitude: 0)
@@ -464,13 +466,27 @@ public class CameraManager {
             return CLLocationCoordinate2D(latitude: 0, longitude: 0)
         }
 
+        /// Stop gap solution until we land on a fix all
+        var pitchFactor: CGFloat = mapView.pitch
+        if pitchedDrift {
+            if pitchFactor != 0.0 {
+                // These calculations are creating a multiplier for the offset to normalize the offset for pitched maps
+                pitchFactor /= 10.0
+                pitchFactor += 1.5
+            } else {
+                pitchFactor = 1.0 // We do not want divide by 0
+            }
+        } else {
+            pitchFactor = 1.0 // We do not want divide by 0
+        }
+
         let cameraViewSize    = mapView.cameraView.frame.size
         let cameraPadding     = mapView.cameraView.padding
         let viewPortSize      = CGSize(width: cameraViewSize.width - cameraPadding.left - cameraPadding.right,
                                        height: cameraViewSize.height - cameraPadding.top - cameraPadding.bottom)
         let viewPortCenter    = CGPoint(x: (viewPortSize.width / 2) + cameraPadding.left,
                                         y: (viewPortSize.height / 2) + cameraPadding.top)
-        let newViewPortCenter = CGPoint(x: viewPortCenter.x - offset.x, y: viewPortCenter.y - offset.y)
+        let newViewPortCenter = CGPoint(x: viewPortCenter.x - (offset.x / pitchFactor), y: viewPortCenter.y - (offset.y / pitchFactor))
         var centerCoordinate  = mapView.coordinate(for: newViewPortCenter)
 
         var newLong: Double

Sources/MapboxMaps/Gestures/GestureHandlers/PanGestureHandler.swift

@@ -29,10 +29,9 @@ internal class PanGestureHandler: GestureHandler {
             pan.setTranslation(.zero, in: pan.view)
         case .ended, .cancelled:
             var velocity = pan.velocity(in: pan.view)
-            if self.decelerationRate == 0.0
-                || (sqrt(pow(velocity.x, 2) + pow(velocity.y, 2)) < 100) {
+            let velocityHypot = sqrt(pow(velocity.x, 2) + pow(velocity.y, 2))
 
-                // Not enough velocity to overcome friction
+            if self.decelerationRate == 0.0 || velocityHypot < 1000 {
                 velocity = CGPoint.zero
             }
 
@@ -43,7 +42,6 @@ internal class PanGestureHandler: GestureHandler {
 
                 self.delegate.panEnded(with: offset)
             }
-
         default:
             break
         }

Sources/MapboxMaps/Gestures/GestureManager.swift

@@ -119,11 +119,13 @@ internal protocol CameraManagerProtocol: AnyObject {
                    duration: TimeInterval,
                    completion: ((Bool) -> Void)?)
 
+    //swiftlint:disable function_parameter_count
     func moveCamera(by offset: CGPoint?,
                     rotation: CGFloat?,
                     pitch: CGFloat?,
                     zoom: CGFloat?,
-                    animated: Bool)
+                    animated: Bool,
+                    pitchedDrift: Bool)
 
     func cancelTransitions()
 }
@@ -311,15 +313,12 @@ extension GestureManager: GestureHandlerDelegate {
 
     // MapView has been panned
     internal func panned(by displacement: CGPoint) {
-        self.cameraManager.moveCamera(by: displacement, rotation: nil, pitch: nil, zoom: nil, animated: false)
+        self.cameraManager.moveCamera(by: displacement, rotation: nil, pitch: nil, zoom: nil, animated: false, pitchedDrift: false)
     }
 
     // Pan has ended on the MapView with a residual `offset`
     internal func panEnded(with offset: CGPoint) {
-        if let pitch = self.cameraManager.mapView?.pitch,
-           pitch == 0.0 {
-            self.cameraManager.moveCamera(by: offset, rotation: nil, pitch: nil, zoom: nil, animated: true)
-        }
+        self.cameraManager.moveCamera(by: offset, rotation: nil, pitch: nil, zoom: nil, animated: true, pitchedDrift: true)
     }
 
     internal func cancelGestureTransitions() {

Tests/MapboxMapsTests/Foundation/Camera/MapboxMapsCameraTests.swift

@@ -321,7 +321,7 @@ class CameraManagerTests: XCTestCase {
             bearing: bearing,
             animated: false)
 
-        let shiftedCenterCoordinate = cameraManager.shiftCenterCoordinate(by: offset)
+        let shiftedCenterCoordinate = cameraManager.shiftCenterCoordinate(by: offset, pitchedDrift: false)
 
         XCTAssertGreaterThan(shiftedCenterCoordinate.longitude, 180, line: line)
     }
@@ -337,7 +337,7 @@ class CameraManagerTests: XCTestCase {
             bearing: bearing,
             animated: false)
 
-        let shiftedCenterCoordinate = cameraManager.shiftCenterCoordinate(by: offset)
+        let shiftedCenterCoordinate = cameraManager.shiftCenterCoordinate(by: offset, pitchedDrift: false)
 
         XCTAssertLessThan(shiftedCenterCoordinate.longitude, -180, line: line)
     }

Tests/MapboxMapsTests/Gestures/MockCameraManager.swift

@@ -31,11 +31,13 @@ final class MockCameraManager: CameraManagerProtocol {
                 completion: completion))
     }
 
+    //swiftlint:disable function_parameter_count
     func moveCamera(by offset: CGPoint?,
                     rotation: CGFloat?,
                     pitch: CGFloat?,
                     zoom: CGFloat?,
-                    animated: Bool) {
+                    animated: Bool,
+                    pitchedDrift: Bool) {
     }
 
     func cancelTransitions() {