Skip to content

Make bearing a clockwise map rotation #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wf9a5m75 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Make bearing a clockwise map rotation #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sources/MapConductorForMapKit/MapCameraPositionExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import MapKit
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore

private let converter = MapKitZoomAltitudeConverter(zoom0Altitude: 171_319_879.0)
private let mapKitMaxPitch: Double = 80.9
Expand Down Expand Up @@ -30,7 +30,7 @@ public extension MapCameraPosition {
? Spherical.computeOffset(
origin: position,
distance: distance * tan(pitchRadians),
heading: bearing
heading: CameraBearing.toNativeHeading(bearing)
)
: position

Expand All @@ -42,7 +42,7 @@ public extension MapCameraPosition {
),
fromDistance: distance,
pitch: nativePitch,
heading: bearing
heading: CameraBearing.toNativeHeading(bearing)
)
}
}
Expand Down Expand Up @@ -95,7 +95,7 @@ public extension MKMapView {
return MapCameraPosition(
position: position,
zoom: zoom,
bearing: camera.heading,
bearing: CameraBearing.bearingFromNativeHeading(camera.heading),
tilt: logicalTilt,
visibleRegion: visibleRegion
)
Expand Down
6 changes: 3 additions & 3 deletions Sources/MapConductorForMapKit/controller/MapKitViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import CoreLocation
import MapKit
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore
import QuartzCore
import UIKit

Expand Down Expand Up @@ -228,12 +228,12 @@ final class MapKitViewController: MapViewControllerProtocol {
// Use UIView.animate to respect the specified duration
UIView.animate(withDuration: duration) {
mapView.setVisibleMapRect(rect, edgePadding: .zero, animated: false)
Self.applyHeading(position.bearing, center: centerCoordinate, to: mapView, animated: false)
Self.applyHeading(CameraBearing.toNativeHeading(position.bearing), center: centerCoordinate, to: mapView, animated: false)
}
} else {
// Use MapKit's default animation or no animation
mapView.setVisibleMapRect(rect, edgePadding: .zero, animated: animated)
Self.applyHeading(position.bearing, center: centerCoordinate, to: mapView, animated: animated)
Self.applyHeading(CameraBearing.toNativeHeading(position.bearing), center: centerCoordinate, to: mapView, animated: animated)
}

return true
Expand Down
Loading