Skip to content

Make bearing a clockwise map rotation #1

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

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
22 changes: 12 additions & 10 deletions Sources/MapConductorForOpenMobileMaps/OpenMobileMapsMapViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import CoreGraphics
import Foundation
import MapCore
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore
import QuartzCore
import UIKit

Expand Down Expand Up @@ -515,19 +515,21 @@ public final class OpenMobileMapsMapViewController: MapViewControllerProtocol {
/// マーカータイルのラスターレイヤ id の前置き。外すときの目印。
static let markerTileIdPrefix = "marker-tile-"

/// 方位の符号。**SDK は MapConductor と逆回りである。**
/// 方位の符号。**SDK の `setRotation` は MapConductor の bearing と同じ向き**
/// （どちらも「地図を時計回りに回す量」）なので、変換は恒等になる。
///
/// MapConductor の bearing は Google 準拠で「カメラが向いている方位を北から時計回りに測る」。
/// SDK の `setRotation` は地図を反時計回りに回す量なので、符号を反転する。
/// 反転を忘れると bearing 270 の地図が 90 として描かれ、**ちょうど 180 度ずれる**
/// （単独で見ると「回っている」ので正しく見えてしまう。android では Tilt ページを
/// MapLibre と並べて気づいた）。
static func nativeRotationFromBearing(_ bearing: Double) -> Float { Float(-bearing) }
/// ここは机上ではなく端末で決めた値である。基準は「MapLibre と並べて同じ向きに
/// 描かれること」で、MapLibre 側が heading 系（bearing の符号反転）に変わったのに
/// 合わせてこちらも反転させてある（android-for-openmobilemaps と同じ）。
/// **符号を触ったら必ず Tilt ページを MapLibre と並べて確認すること。**
/// 単独で見ると「回っている」ので正しく見えてしまう。
static func nativeRotationFromBearing(_ bearing: Double) -> Float {
Float(CameraBearing.toNativeRotation(bearing))
}

/// SDK の回転角 → MapConductor の bearing（0 以上 360 未満）。
static func bearingFromNativeRotation(_ rotation: Float) -> Double {
let bearing = Double(-rotation).truncatingRemainder(dividingBy: 360.0)
return bearing < 0 ? bearing + 360.0 : bearing
CameraBearing.bearingFromNativeRotation(Double(rotation))
}
}

Expand Down
6 changes: 3 additions & 3 deletions Sources/MapConductorForOpenMobileMaps/OpenMobileMapsTiltEmulation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore

/// Open Mobile Maps の 2D カメラ向けの tilt 擬似表現。
///
Expand Down Expand Up @@ -44,7 +44,7 @@ enum OpenMobileMapsTiltEmulation {
let tiltAbsRad = tiltAbsDeg * .pi / 180.0
let altitude = altitudeFor(unifiedZoom: position.zoom, latitude: origin.latitude)
let distanceForward = altitude * cos(tiltAbsRad) * tan(tiltAbsRad) * targetDistanceScale
let target = Spherical.computeOffset(origin: origin, distance: distanceForward, heading: position.bearing)
let target = Spherical.computeOffset(origin: origin, distance: distanceForward, heading: CameraBearing.toNativeHeading(position.bearing))
return (target, zoom)
}

Expand All @@ -65,7 +65,7 @@ enum OpenMobileMapsTiltEmulation {
let originalPosition = Spherical.computeOffset(
origin: center,
distance: distanceBackward,
heading: bearing + 180.0
heading: CameraBearing.toNativeHeading(bearing) + 180.0
)
return (originalPosition, originalZoom)
}
Expand Down