MapViewPort implementation to listen to raw values of 'camera' at any time

Author: Archdoog

Sources/MapLibreSwiftUI/MapViewCoordinator.swift

@@ -207,9 +207,9 @@ extension MapViewCoordinator: MLNMapViewDelegate {
         addLayers(to: mglStyle)
         onStyleLoaded?(mglStyle)
     }
-    
+
     // MARK: MapViewCamera
-    
+
     @MainActor private func updateParentCamera(mapView: MLNMapView, reason: MLNCameraChangeReason) {
         // If any of these are a mismatch, we know the camera is no longer following a desired method, so we should
         // detach and revert to a .centered camera. If any one of these is true, the desired camera state still
@@ -227,57 +227,57 @@ extension MapViewCoordinator: MLNMapViewDelegate {
         case .centered, .rect, .showcase:
             false
         }
-        
+
         guard !isProgrammaticallyTracking else {
             // Programmatic tracking is still active, we can ignore camera updates until we unset/fail this boolean
             // check
             return
         }
-        
+
         // Publish the MLNMapView's "raw" camera state to the MapView camera binding.
         // This path only executes when the map view diverges from the parent state, so this is a "matter of fact"
         // state propagation.
         let newCamera: MapViewCamera = .center(mapView.centerCoordinate,
                                                zoom: mapView.zoomLevel,
                                                // TODO: Pitch doesn't really describe current state
                                                pitch: .freeWithinRange(
-                                                minimum: mapView.minimumPitch,
-                                                maximum: mapView.maximumPitch
+                                                   minimum: mapView.minimumPitch,
+                                                   maximum: mapView.maximumPitch
                                                ),
                                                direction: mapView.direction,
                                                reason: CameraChangeReason(reason))
         snapshotCamera = newCamera
         parent.camera = newCamera
     }
-    
+
     /// The MapView's region has changed with a specific reason.
     public func mapView(_ mapView: MLNMapView, regionDidChangeWith reason: MLNCameraChangeReason, animated _: Bool) {
         // FIXME: CI complains about MainActor.assumeIsolated being unavailable before iOS 17, despite building on iOS 17.2... This is an epic hack to fix it for now. I can only assume this is an issue with Xcode pre-15.3
         // TODO: We could put this in regionIsChangingWith if we calculate significant change/debounce.
         Task { @MainActor in
             updateViewPort(mapView: mapView)
         }
-        
+
         guard !suppressCameraUpdatePropagation else {
             return
         }
-        
+
         // FIXME: CI complains about MainActor.assumeIsolated being unavailable before iOS 17, despite building on iOS 17.2... This is an epic hack to fix it for now. I can only assume this is an issue with Xcode pre-15.3
         Task { @MainActor in
             updateParentCamera(mapView: mapView, reason: reason)
         }
     }
-    
+
     // MARK: MapViewPort
-    
+
     @MainActor private func updateViewPort(mapView: MLNMapView) {
         // Calculate the Raw "ViewPort"
         let calculatedViewPort = MapViewPort(
             center: mapView.centerCoordinate,
             zoom: mapView.zoomLevel,
             direction: mapView.direction
         )
-        
+
         onViewPortChanged(calculatedViewPort)
     }
 }

Sources/MapLibreSwiftUI/MapViewModifiers.swift

@@ -99,7 +99,7 @@ public extension MapView {
 
         return result
     }
-    
+
     func onMapViewPortUpdate(_ onViewPortChanged: @escaping (MapViewPort) -> Void) -> Self {
         var result = self
         result.onViewPortChanged = onViewPortChanged

Sources/MapLibreSwiftUI/Models/MapViewPort.swift

@@ -1,43 +1,41 @@
-import Foundation
 import CoreLocation
+import Foundation
 
 /// A representation of the MapView's current ViewPort.
 ///
 /// This includes similar data to the MapViewCamera, but represents the raw
 /// values associated with the MapView. This information could used to prepare
 /// a new MapViewCamera on a scene, to cache the camera state, etc.
 public struct MapViewPort: Hashable, Equatable {
-    
     /// The current center coordinate of the MapView
     public let center: CLLocationCoordinate2D
-    
+
     /// The current zoom value of the MapView
     public let zoom: Double
-    
+
     /// The current compass direction of the MapView
     public let direction: CLLocationDirection
-    
+
     public init(center: CLLocationCoordinate2D, zoom: Double, direction: CLLocationDirection) {
         self.center = center
         self.zoom = zoom
         self.direction = direction
     }
-    
+
     public static func zero(zoom: Double = 10) -> MapViewPort {
-        return MapViewPort(center: CLLocationCoordinate2D(latitude: 0, longitude: 0),
-                           zoom: zoom,
-                           direction: 0)
+        MapViewPort(center: CLLocationCoordinate2D(latitude: 0, longitude: 0),
+                    zoom: zoom,
+                    direction: 0)
     }
 }
 
-extension MapViewPort {
-    
+public extension MapViewPort {
     /// Generate a basic MapViewCamera that represents the MapViewPort
     ///
     /// - Returns: The calculated MapViewCamera
-    public func asMapViewCamera() -> MapViewCamera {
-        return .center(center,
-                       zoom: zoom,
-                       direction: direction)
+    func asMapViewCamera() -> MapViewCamera {
+        .center(center,
+                zoom: zoom,
+                direction: direction)
     }
 }