Merge pull request #35 from Rallista/feat/change-reason-on-view-port

feat: added change reason to view port update
maplibre · Apr 18, 2024 · 3170249 · 3170249
2 parents ac4f4d8 + 8f3689c
commit 3170249
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Sources/MapLibreSwiftUI/MapViewCoordinator.swift b/Sources/MapLibreSwiftUI/MapViewCoordinator.swift
@@ -260,7 +260,7 @@ extension MapViewCoordinator: MLNMapViewDelegate {
         // 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)
+            updateViewPort(mapView: mapView, reason: reason)
         }
 
         guard !suppressCameraUpdatePropagation else {
@@ -275,12 +275,13 @@ extension MapViewCoordinator: MLNMapViewDelegate {
 
     // MARK: MapViewPort
 
-    @MainActor private func updateViewPort(mapView: MLNMapView) {
+    @MainActor private func updateViewPort(mapView: MLNMapView, reason: MLNCameraChangeReason) {
         // Calculate the Raw "ViewPort"
         let calculatedViewPort = MapViewPort(
             center: mapView.centerCoordinate,
             zoom: mapView.zoomLevel,
-            direction: mapView.direction
+            direction: mapView.direction,
+            lastReasonForChange: CameraChangeReason(reason)
         )
 
         onViewPortChanged(calculatedViewPort)

diff --git a/Sources/MapLibreSwiftUI/Models/MapViewPort.swift b/Sources/MapLibreSwiftUI/Models/MapViewPort.swift
@@ -16,16 +16,25 @@ public struct MapViewPort: Hashable, Equatable {
     /// The current compass direction of the MapView
     public let direction: CLLocationDirection
 
-    public init(center: CLLocationCoordinate2D, zoom: Double, direction: CLLocationDirection) {
+    /// The reason the view port was changed.
+    public let lastReasonForChange: CameraChangeReason?
+
+    public init(center: CLLocationCoordinate2D,
+                zoom: Double,
+                direction: CLLocationDirection,
+                lastReasonForChange: CameraChangeReason?)
+    {
         self.center = center
         self.zoom = zoom
         self.direction = direction
+        self.lastReasonForChange = lastReasonForChange
     }
 
     public static func zero(zoom: Double = 10) -> MapViewPort {
         MapViewPort(center: CLLocationCoordinate2D(latitude: 0, longitude: 0),
                     zoom: zoom,
-                    direction: 0)
+                    direction: 0,
+                    lastReasonForChange: nil)
     }
 }