Skip to content

Make bearing a clockwise map rotation #5

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 #5

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
12 changes: 6 additions & 6 deletions Sources/MapConductorForMapbox/MapCameraPositionExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import CoreLocation
import Foundation
import MapboxMaps
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore

// Mapbox zoom is offset by +1.0 from "Google-style" zoom (same as MapLibre).
internal let mapboxCameraZoomAdjustValue = 1.0
Expand All @@ -14,7 +14,7 @@ public extension MapCameraPosition {
return CameraOptions(
center: CLLocationCoordinate2D(latitude: position.latitude, longitude: position.longitude),
zoom: MapboxZoomAltitudeConverter.googleZoomToMapboxZoom(zoom),
bearing: bearing,
bearing: CameraBearing.toNativeHeading(bearing),
pitch: tilt
)
}
Expand All @@ -26,13 +26,13 @@ public extension MapCameraPosition {
let maplibreZoomForAltitude = MapboxZoomAltitudeConverter.googleZoomToMapboxZoom(zoom)
let altitude = converter.zoomLevelToAltitude(zoomLevel: maplibreZoomForAltitude, latitude: position.latitude, tilt: 0.0)
let distanceForward = altitude * tan(tiltAbsRad)
let target = Spherical.computeOffset(origin: position, distance: distanceForward, heading: bearing)
let target = Spherical.computeOffset(origin: position, distance: distanceForward, heading: CameraBearing.toNativeHeading(bearing))
let mapboxZoom = converter.altitudeToZoomLevel(altitude: altitude/cos(tiltAbsRad), latitude: target.latitude, tilt: 0.0)

return CameraOptions(
center: CLLocationCoordinate2D(latitude: target.latitude, longitude: target.longitude),
zoom: mapboxZoom,
bearing: bearing,
bearing: CameraBearing.toNativeHeading(bearing),
pitch: tilt
)
}
Expand All @@ -55,7 +55,7 @@ public extension CameraState {
return MapCameraPosition(
position: shiftedCenter,
zoom: MapboxZoomAltitudeConverter.mapboxZoomToGoogleZoom(zoom),
bearing: bearing,
bearing: CameraBearing.bearingFromNativeHeading(bearing),
tilt: pitch,
visibleRegion: visibleRegion
)
Expand All @@ -82,7 +82,7 @@ public extension CameraState {
return MapCameraPosition(
position: originalCenter,
zoom: MapboxZoomAltitudeConverter.mapboxZoomToGoogleZoom(originalMapboxZoom),
bearing: bearing,
bearing: CameraBearing.bearingFromNativeHeading(bearing),
tilt: -pitchAbsDeg,
visibleRegion: visibleRegion
)
Expand Down