Fix/camera bug fixes (#90)

* feat: task based camera

* fix: modern concurrency camera

* fix: modern concurrency camera

* Update MapViewCoordinatorCameraTests.swift

Co-authored-by: Ian Wagner <[email protected]>

* Correcting task sleep

* Adds docs, reverts structure for private

* Adds docs, reverts structure for private

* Additional camera fixes and improvements

---------

Co-authored-by: Ian Wagner <[email protected]>

Author: Archdoog

Sources/MapLibreSwiftUI/MapViewCoordinator.swift

@@ -182,10 +182,13 @@ MLNMapViewDelegate {
 
         // Cancel any existing camera update completion task.
         cameraUpdateTask?.cancel()
-        cameraUpdateContinuation = nil
 
         cameraUpdateTask = Task { @MainActor in
             return await withCheckedContinuation { continuation in
+                // Clean up the continuation if it was already set.
+                cameraUpdateContinuation?.resume()
+                cameraUpdateContinuation = nil
+
                 // Store the continuation to be resumed in mapViewDidBecomeIdle
                 cameraUpdateContinuation = continuation
 
@@ -234,35 +237,27 @@ MLNMapViewDelegate {
 
                         mapView.userTrackingMode = .follow
 
-                        mapView.setZoomLevel(zoom, animated: false)
+                        mapView.zoomLevel = zoom
                         mapView.direction = direction
 
                         mapView.minimumPitch = pitch
                         mapView.maximumPitch = pitch
                         mapView.minimumPitch = pitchRange.rangeValue.lowerBound
                         mapView.maximumPitch = pitchRange.rangeValue.upperBound
-
                     } else {
                         mapView.setUserTrackingMode(.follow, animated: animated) {
                             guard mapView.userTrackingMode == .follow else {
                                 // Exit early if the user tracking mode is no longer set to follow
                                 return
                             }
 
+                            mapView.zoomLevel = zoom
+                            mapView.direction = direction
+
+                            mapView.minimumPitch = pitch
+                            mapView.maximumPitch = pitch
                             mapView.minimumPitch = pitchRange.rangeValue.lowerBound
                             mapView.maximumPitch = pitchRange.rangeValue.upperBound
-                            let camera = mapView.camera
-                            camera.heading = direction
-                            camera.pitch = pitch
-
-                            let altitude = MLNAltitudeForZoomLevel(
-                                zoom,
-                                pitch,
-                                mapView.camera.centerCoordinate.latitude,
-                                mapView.frame.size
-                            )
-                            camera.altitude = altitude
-                            mapView.setCamera(camera, animated: animated)
                         }
                     }
                 case let .trackingUserLocationWithHeading(zoom: zoom, pitch: pitch, pitchRange: pitchRange):
@@ -272,32 +267,26 @@ MLNMapViewDelegate {
                         // Needs to be non-animated or else it messes up following
 
                         mapView.userTrackingMode = .followWithHeading
-                        mapView.setZoomLevel(zoom, animated: false)
+
+                        mapView.zoomLevel = zoom
+
                         mapView.minimumPitch = pitch
                         mapView.maximumPitch = pitch
                         mapView.minimumPitch = pitchRange.rangeValue.lowerBound
                         mapView.maximumPitch = pitchRange.rangeValue.upperBound
-
                     } else {
                         mapView.setUserTrackingMode(.followWithHeading, animated: animated) {
                             guard mapView.userTrackingMode == .followWithHeading else {
                                 // Exit early if the user tracking mode is no longer set to followWithHeading
                                 return
                             }
 
+                            mapView.zoomLevel = zoom
+
+                            mapView.minimumPitch = pitch
+                            mapView.maximumPitch = pitch
                             mapView.minimumPitch = pitchRange.rangeValue.lowerBound
                             mapView.maximumPitch = pitchRange.rangeValue.upperBound
-                            let camera = mapView.camera
-
-                            let altitude = MLNAltitudeForZoomLevel(
-                                zoom,
-                                pitch,
-                                mapView.camera.centerCoordinate.latitude,
-                                mapView.frame.size
-                            )
-                            camera.altitude = altitude
-                            camera.pitch = pitch
-                            mapView.setCamera(camera, animated: animated)
                         }
                     }
                 case let .trackingUserLocationWithCourse(zoom: zoom, pitch: pitch, pitchRange: pitchRange):
@@ -307,36 +296,32 @@ MLNMapViewDelegate {
                         // so let's do something else instead.
                         // Needs to be non-animated or else it messes up following
 
-                        mapView.setZoomLevel(zoom, animated: false)
+                        mapView.zoomLevel = zoom
+
                         mapView.minimumPitch = pitch
                         mapView.maximumPitch = pitch
                         mapView.minimumPitch = pitchRange.rangeValue.lowerBound
                         mapView.maximumPitch = pitchRange.rangeValue.upperBound
-
                     } else {
                         mapView.setUserTrackingMode(.followWithCourse, animated: animated) {
                             guard mapView.userTrackingMode == .followWithCourse else {
                                 // Exit early if the user tracking mode is no longer set to followWithCourse
                                 return
                             }
 
+                            mapView.zoomLevel = zoom
+
+                            mapView.minimumPitch = pitch
+                            mapView.maximumPitch = pitch
                             mapView.minimumPitch = pitchRange.rangeValue.lowerBound
                             mapView.maximumPitch = pitchRange.rangeValue.upperBound
-
-                            let camera = mapView.camera
-
-                            let altitude = MLNAltitudeForZoomLevel(
-                                zoom,
-                                pitch,
-                                mapView.camera.centerCoordinate.latitude,
-                                mapView.frame.size
-                            )
-                            camera.altitude = altitude
-                            camera.pitch = pitch
-                            mapView.setCamera(camera, animated: animated)
                         }
                     }
                 case let .rect(boundingBox, padding):
+                    mapView.minimumPitch = 0
+                    mapView.maximumPitch = 0
+                    mapView.direction = 0
+
                     mapView.setVisibleCoordinateBounds(boundingBox,
                                                        edgePadding: padding,
                                                        animated: animated,

Tests/MapLibreSwiftUITests/MapViewCoordinator/MapViewCoordinatorCameraTests.swift

@@ -174,8 +174,8 @@ final class MapViewCoordinatorCameraTests: XCTestCase {
             .setCalled(1)
 
         verify(maplibreMapView)
-            .setZoomLevel(.value(10), animated: .value(false))
-            .called(1)
+            .zoomLevel(newValue: .value(10))
+            .setCalled(1)
     }
 
     @MainActor func testUserTrackingWithCourseCameraUpdate() async throws {
@@ -219,8 +219,8 @@ final class MapViewCoordinatorCameraTests: XCTestCase {
             .setCalled(1)
 
         verify(maplibreMapView)
-            .setZoomLevel(.value(10), animated: .value(false))
-            .called(1)
+            .zoomLevel(newValue: .value(10))
+            .setCalled(1)
     }
 
     @MainActor func testUserTrackingWithHeadingUpdate() async throws {
@@ -264,8 +264,8 @@ final class MapViewCoordinatorCameraTests: XCTestCase {
             .setCalled(1)
 
         verify(maplibreMapView)
-            .setZoomLevel(.value(10), animated: .value(false))
-            .called(1)
+            .zoomLevel(newValue: .value(10))
+            .setCalled(1)
     }
 
     // TODO: Test Rect & Showcase once we build it!