PR fixes

maplibre · Mar 19, 2024 · 879bd06 · 879bd06
1 parent 1c321e6
commit 879bd06
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/Sources/MapLibreSwiftUI/Extensions/MapLibre/MLNMapViewCameraUpdating.swift b/Sources/MapLibreSwiftUI/Extensions/MapLibre/MLNMapViewCameraUpdating.swift
@@ -3,6 +3,7 @@ import Foundation
 import MapLibre
 import Mockable
 
+// NOTE: We should eventually mark the entire protocol @MainActor, but Mockable generates some unsafe code at the moment
 @Mockable
 protocol MLNMapViewCameraUpdating: AnyObject {
     @MainActor var userTrackingMode: MLNUserTrackingMode { get set }

diff --git a/Sources/MapLibreSwiftUI/MapViewCoordinator.swift b/Sources/MapLibreSwiftUI/MapViewCoordinator.swift
@@ -54,6 +54,10 @@ public class MapViewCoordinator: NSObject {
         }
 
         suppressCameraUpdatePropagation = true
+        defer {
+            suppressCameraUpdatePropagation = false
+        }
+
         switch camera.state {
         case let .centered(onCoordinate: coordinate, zoom: zoom, pitch: pitch, direction: direction):
             mapView.userTrackingMode = .none
@@ -92,7 +96,6 @@ public class MapViewCoordinator: NSObject {
         }
 
         snapshotCamera = camera
-        suppressCameraUpdatePropagation = false
     }
 
     // MARK: - Coordinator API - Styles + Layers
@@ -247,7 +250,7 @@ extension MapViewCoordinator: MLNMapViewDelegate {
             return
         }
 
-        // FIXME: CI complains about this 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
+        // 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)
         }

diff --git a/Sources/MapLibreSwiftUI/StaticLocationManager.swift b/Sources/MapLibreSwiftUI/StaticLocationManager.swift
@@ -20,6 +20,7 @@ public final class StaticLocationManager: NSObject, @unchecked Sendable {
         }
     }
 
+    // TODO: Investigate what this does and document it
     public var headingOrientation: CLDeviceOrientation = .portrait
 
     public var lastLocation: CLLocation {

diff --git a/Tests/MapLibreSwiftUITests/Examples/MapControlsTests.swift b/Tests/MapLibreSwiftUITests/Examples/MapControlsTests.swift
@@ -22,6 +22,16 @@ final class MapControlsTests: XCTestCase {
         }
     }
 
+    func testLogoChangePosition() {
+        assertView {
+            MapView(styleURL: demoTilesURL)
+                .mapControls {
+                    LogoView()
+                        .position(.topLeft)
+                }
+        }
+    }
+
     func testCompassOnly() {
         assertView {
             MapView(styleURL: demoTilesURL)

diff --git a/...iftUITests/Examples/__Snapshots__/MapControlsTests/testLogoChangePosition.1.png b/...iftUITests/Examples/__Snapshots__/MapControlsTests/testLogoChangePosition.1.png