From 155a46aa7d9df77ff5aac5dc1330b7e4ae197134 Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Wed, 11 Nov 2026 21:40:20 -0800 Subject: [PATCH 1/3] Apply camera paddings and report fov on MapKit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MKMapCamera has no padding, so the camera center is shifted with the core CameraPaddingEmulation (using MapKit's measured vertical fov, 30°) and shifted back on read; the read camera carries paddings and fov. --- .../MapCameraPositionExtensions.swift | 6 ++++ .../MapConductorForMapKit/MapKitMapView.swift | 6 ++-- .../controller/MapKitViewController.swift | 29 +++++++++++++++++-- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/Sources/MapConductorForMapKit/MapCameraPositionExtensions.swift b/Sources/MapConductorForMapKit/MapCameraPositionExtensions.swift index b740503..1283bf7 100644 --- a/Sources/MapConductorForMapKit/MapCameraPositionExtensions.swift +++ b/Sources/MapConductorForMapKit/MapCameraPositionExtensions.swift @@ -8,6 +8,12 @@ private let mapConductorTileSizePoints: Double = 256.0 private let minCosLat: Double = 0.01 private let minCosTilt: Double = 0.05 +/// MapKit(iOS)のカメラの縦の視野角(度)。 +/// +/// MapKit は値を公開していない。iPad Pro 11 で、傾けた地図の中心と北の地点の画面位置から +/// 焦点距離を求めて実測した値(tilt 30°)。 +let mapKitVerticalFieldOfView: Double = 30.0 + // Convert from MapCameraPosition to MKMapCamera public extension MapCameraPosition { /// Pass the target map view so the camera distance is derived from the view's actual diff --git a/Sources/MapConductorForMapKit/MapKitMapView.swift b/Sources/MapConductorForMapKit/MapKitMapView.swift index 5f659cf..0430eab 100644 --- a/Sources/MapConductorForMapKit/MapKitMapView.swift +++ b/Sources/MapConductorForMapKit/MapKitMapView.swift @@ -443,7 +443,8 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable { func mapViewDidChangeVisibleRegion(_ mapView: MKMapView) { guard isRegionChanging else { return } - let camera = mapView.toMapCameraPosition(logicalTiltHint: controller?.lastLogicalTilt) + let raw = mapView.toMapCameraPosition(logicalTiltHint: controller?.lastLogicalTilt) + let camera = controller?.reportedCamera(raw, mapView: mapView) ?? raw state.updateCameraPosition(camera) polylineController?.setCurrentCameraPosition(camera) circleController?.setCurrentCameraPosition(camera) @@ -765,10 +766,11 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable { farRight: geoPoint(at: CGPoint(x: mapView.bounds.maxX, y: 0), mapView: mapView) ) - return mapView.toMapCameraPosition( + let raw = mapView.toMapCameraPosition( logicalTiltHint: controller?.lastLogicalTilt, visibleRegion: visibleRegion ) + return controller?.reportedCamera(raw, mapView: mapView) ?? raw } private func geoPoint(at point: CGPoint, mapView: MKMapView) -> GeoPoint? { diff --git a/Sources/MapConductorForMapKit/controller/MapKitViewController.swift b/Sources/MapConductorForMapKit/controller/MapKitViewController.swift index c5e0f86..105ba9a 100644 --- a/Sources/MapConductorForMapKit/controller/MapKitViewController.swift +++ b/Sources/MapConductorForMapKit/controller/MapKitViewController.swift @@ -16,6 +16,9 @@ final class MapKitViewController: MapViewControllerProtocol { let overlayControllers = OverlayControllerRegistry() private weak var mapView: MKMapView? private(set) var lastLogicalTilt: Double? + /// 直近の移動で要求されたパディング。MapKit のカメラはパディングを持たないので、中心をずらして + /// 再現し(``CameraPaddingEmulation``)、読み戻しで逆にずらすときに使う。 + private(set) var lastPaddings: MapPaddingsProtocol? private let tileSizePoints: Double = 256.0 private let minCosLat: Double = 0.01 @@ -96,9 +99,11 @@ final class MapKitViewController: MapViewControllerProtocol { mapInitializedListener = listener } - func moveCamera(position: MapCameraPosition) { + func moveCamera(position requested: MapCameraPosition) { cancelCameraAnimation() guard let mapView = mapView else { return } + lastPaddings = requested.paddings + let position = paddingApplied(requested, mapView: mapView) lastLogicalTilt = position.tilt if abs(position.tilt) < 0.01, mapView.bounds.isEmpty { DispatchQueue.main.async { [weak self, weak mapView] in @@ -113,14 +118,17 @@ final class MapKitViewController: MapViewControllerProtocol { mapView.setCamera(camera, animated: false) } - func animateCamera(position: MapCameraPosition, duration: Long) { + func animateCamera(position requested: MapCameraPosition, duration: Long) { cancelCameraAnimation() guard let mapView = mapView else { return } let durationSeconds = Double(duration) / 1000.0 guard durationSeconds > 0 else { - moveCamera(position: position) + moveCamera(position: requested) return } + lastPaddings = requested.paddings + // 補間は「画面中心」の空間で行う(from も中心のまま読む)。 + let position = paddingApplied(requested, mapView: mapView) let from = mapView.toMapCameraPosition(logicalTiltHint: lastLogicalTilt) lastLogicalTilt = position.tilt @@ -301,6 +309,21 @@ final class MapKitViewController: MapViewControllerProtocol { } } + /// MapKit へ渡すカメラ。パディングの分だけ中心をずらす。 + private func paddingApplied(_ position: MapCameraPosition, mapView: MKMapView) -> MapCameraPosition { + CameraPaddingEmulation.applied(to: position, fov: mapKitVerticalFieldOfView, viewportSize: mapView.bounds.size) + } + + /// MapKit から読み戻したカメラ(画面中心)を、ターゲット・パディング・視野角を持つカメラへ戻す。 + func reportedCamera(_ camera: MapCameraPosition, mapView: MKMapView) -> MapCameraPosition { + CameraPaddingEmulation.restored( + camera, + paddings: lastPaddings, + fov: mapKitVerticalFieldOfView, + viewportSize: mapView.bounds.size + ) + } + private func applyCameraFrame(_ position: MapCameraPosition, mapView: MKMapView) { lastLogicalTilt = position.tilt // One-step move (no MapKit internal animation). This is the basis for our custom duration-controlled animation. From 9ea8fe3ec276cd5f5c74e38186180252b6711c42 Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Wed, 11 Nov 2026 21:59:17 -0800 Subject: [PATCH 2/3] Measure the padded target with MapKit's projection MapKit's scale differs slightly from the model and its pitch limit depends on altitude, so after each move (and at the end of an animation) the camera center is corrected with the map's projection, and the target is read back from the padded center. --- .../controller/MapKitViewController.swift | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/Sources/MapConductorForMapKit/controller/MapKitViewController.swift b/Sources/MapConductorForMapKit/controller/MapKitViewController.swift index 105ba9a..904d276 100644 --- a/Sources/MapConductorForMapKit/controller/MapKitViewController.swift +++ b/Sources/MapConductorForMapKit/controller/MapKitViewController.swift @@ -19,6 +19,8 @@ final class MapKitViewController: MapViewControllerProtocol { /// 直近の移動で要求されたパディング。MapKit のカメラはパディングを持たないので、中心をずらして /// 再現し(``CameraPaddingEmulation``)、読み戻しで逆にずらすときに使う。 private(set) var lastPaddings: MapPaddingsProtocol? + /// アニメーションの終わりに、ターゲットの位置を投影で詰め直すための要求。 + private var cameraAnimationRequested: MapCameraPosition? private let tileSizePoints: Double = 256.0 private let minCosLat: Double = 0.01 @@ -112,10 +114,12 @@ final class MapKitViewController: MapViewControllerProtocol { } } if applyTopDownZoom(position: position, mapView: mapView, animated: false) { + correctPaddedTarget(requested, mapView: mapView) return } let camera = position.toMKMapCamera(on: mapView) mapView.setCamera(camera, animated: false) + correctPaddedTarget(requested, mapView: mapView) } func animateCamera(position requested: MapCameraPosition, duration: Long) { @@ -129,6 +133,7 @@ final class MapKitViewController: MapViewControllerProtocol { lastPaddings = requested.paddings // 補間は「画面中心」の空間で行う(from も中心のまま読む)。 let position = paddingApplied(requested, mapView: mapView) + cameraAnimationRequested = requested let from = mapView.toMapCameraPosition(logicalTiltHint: lastLogicalTilt) lastLogicalTilt = position.tilt @@ -273,6 +278,7 @@ final class MapKitViewController: MapViewControllerProtocol { } private func cancelCameraAnimation() { + cameraAnimationRequested = nil cameraAnimationDisplayLink?.invalidate() cameraAnimationDisplayLink = nil cameraAnimationFrames.removeAll() @@ -303,6 +309,10 @@ final class MapKitViewController: MapViewControllerProtocol { let frame = cameraAnimationFrames[targetIndex] applyCameraFrame(frame, mapView: mapView) } + if progress >= 1.0, let requested = cameraAnimationRequested { + cameraAnimationRequested = nil + correctPaddedTarget(requested, mapView: mapView) + } if progress >= 1.0 { cancelCameraAnimation() @@ -315,15 +325,42 @@ final class MapKitViewController: MapViewControllerProtocol { } /// MapKit から読み戻したカメラ(画面中心)を、ターゲット・パディング・視野角を持つカメラへ戻す。 + /// ターゲットはパディングの残りの中央にある地点を地図に直接聞く。 func reportedCamera(_ camera: MapCameraPosition, mapView: MKMapView) -> MapCameraPosition { CameraPaddingEmulation.restored( camera, paddings: lastPaddings, fov: mapKitVerticalFieldOfView, - viewportSize: mapView.bounds.size + viewportSize: mapView.bounds.size, + unproject: { [weak mapView] point in + guard let mapView else { return nil } + let coordinate = mapView.convert(point, toCoordinateFrom: mapView) + return GeoPoint(latitude: coordinate.latitude, longitude: coordinate.longitude) + } ) } + /// 計算で置いた中心だと、MapKit の縮尺のずれや pitch の上限(高度で変わる)でターゲットが + /// ずれる。地図の投影で実際の位置を測り、パディングの残りの中央に来るまで中心だけを動かし直す。 + private func correctPaddedTarget(_ requested: MapCameraPosition, mapView: MKMapView) { + let target = CLLocationCoordinate2D(latitude: requested.position.latitude, longitude: requested.position.longitude) + for _ in 0..<3 { + guard let center = CameraPaddingEmulation.correctedCenter( + target: requested.position, + paddings: requested.paddings, + viewportSize: mapView.bounds.size, + project: { _ in mapView.convert(target, toPointTo: mapView) }, + unproject: { point in + let coordinate = mapView.convert(point, toCoordinateFrom: mapView) + return GeoPoint(latitude: coordinate.latitude, longitude: coordinate.longitude) + } + ) else { return } + let camera = mapView.camera.copy() as! MKMapCamera + camera.centerCoordinate = CLLocationCoordinate2D(latitude: center.latitude, longitude: center.longitude) + mapView.setCamera(camera, animated: false) + } + } + private func applyCameraFrame(_ position: MapCameraPosition, mapView: MKMapView) { lastLogicalTilt = position.tilt // One-step move (no MapKit internal animation). This is the basis for our custom duration-controlled animation. From f5807f838e619f2496a4f017a11fafa9faaffc61 Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Wed, 11 Nov 2026 22:11:17 -0800 Subject: [PATCH 3/3] Apply MapKit padding corrections on separate run loop turns Back-to-back setCamera calls let MapKit fold the region-change notifications, so the state kept the camera from before the correction. --- .../controller/MapKitViewController.swift | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/Sources/MapConductorForMapKit/controller/MapKitViewController.swift b/Sources/MapConductorForMapKit/controller/MapKitViewController.swift index 904d276..bd5dacd 100644 --- a/Sources/MapConductorForMapKit/controller/MapKitViewController.swift +++ b/Sources/MapConductorForMapKit/controller/MapKitViewController.swift @@ -342,22 +342,27 @@ final class MapKitViewController: MapViewControllerProtocol { /// 計算で置いた中心だと、MapKit の縮尺のずれや pitch の上限(高度で変わる)でターゲットが /// ずれる。地図の投影で実際の位置を測り、パディングの残りの中央に来るまで中心だけを動かし直す。 - private func correctPaddedTarget(_ requested: MapCameraPosition, mapView: MKMapView) { + private func correctPaddedTarget(_ requested: MapCameraPosition, mapView: MKMapView, remaining: Int = 3) { + guard remaining > 0 else { return } let target = CLLocationCoordinate2D(latitude: requested.position.latitude, longitude: requested.position.longitude) - for _ in 0..<3 { - guard let center = CameraPaddingEmulation.correctedCenter( - target: requested.position, - paddings: requested.paddings, - viewportSize: mapView.bounds.size, - project: { _ in mapView.convert(target, toPointTo: mapView) }, - unproject: { point in - let coordinate = mapView.convert(point, toCoordinateFrom: mapView) - return GeoPoint(latitude: coordinate.latitude, longitude: coordinate.longitude) - } - ) else { return } + guard let center = CameraPaddingEmulation.correctedCenter( + target: requested.position, + paddings: requested.paddings, + viewportSize: mapView.bounds.size, + project: { _ in mapView.convert(target, toPointTo: mapView) }, + unproject: { point in + let coordinate = mapView.convert(point, toCoordinateFrom: mapView) + return GeoPoint(latitude: coordinate.latitude, longitude: coordinate.longitude) + } + ) else { return } + // 1 回ずつ次のランループで当てる。同じランループで続けて setCamera すると MapKit は + // 領域変更の通知をまとめてしまい、state に途中のカメラが残る。 + DispatchQueue.main.async { [weak self, weak mapView] in + guard let self, let mapView else { return } let camera = mapView.camera.copy() as! MKMapCamera camera.centerCoordinate = CLLocationCoordinate2D(latitude: center.latitude, longitude: center.longitude) mapView.setCamera(camera, animated: false) + self.correctPaddedTarget(requested, mapView: mapView, remaining: remaining - 1) } }