Skip to content

Make bearing a clockwise map rotation #15

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

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
9 changes: 5 additions & 4 deletions src/main/java/com/mapconductor/googlemaps/MapCameraPosition.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.mapconductor.googlemaps

import com.google.android.gms.maps.model.CameraPosition
import com.mapconductor.core.features.GeoPoint
import com.mapconductor.core.map.CameraBearing
import com.mapconductor.core.map.MapCameraPosition
import com.mapconductor.core.map.MapCameraPositionInterface
import com.mapconductor.core.map.MapPaddings
Expand All @@ -22,7 +23,7 @@ fun MapCameraPosition.toCameraPosition(): CameraPosition {
.target(GeoPoint.from(position).toLatLng())
.zoom(zoom.toFloat())
.tilt(tilt.coerceIn(0.0, 60.0).toFloat())
.bearing(bearing.toFloat())
.bearing(CameraBearing.toNativeHeading(bearing).toFloat())
.build()
} else {
// tilt < 0: 水平線より abs(tilt) 度上方を向く（仰角ビュー）
Expand All @@ -33,15 +34,15 @@ fun MapCameraPosition.toCameraPosition(): CameraPosition {
val tiltAbsRad = Math.toRadians(tiltAbsDeg)
val altitude = converter.zoomLevelToAltitude(zoom, position.latitude, 0.0)
val distanceForward = altitude * tan(tiltAbsRad)
val target = Spherical.computeOffset(position, distanceForward, bearing)
val target = Spherical.computeOffset(position, distanceForward, CameraBearing.toNativeHeading(bearing))
val adjustedZoom = converter.altitudeToZoomLevel(altitude / cos(tiltAbsRad), target.latitude, 0.0)

return CameraPosition
.builder()
.target(target.toLatLng())
.zoom(adjustedZoom.toFloat())
.tilt(tiltAbsDeg.toFloat())
.bearing(bearing.toFloat())
.bearing(CameraBearing.toNativeHeading(bearing).toFloat())
.build()
}
}
Expand Down Expand Up @@ -71,7 +72,7 @@ fun CameraPosition.toMapCameraPosition(paddings: MapPaddingsInterface = MapPaddi
return MapCameraPosition(
position = position,
zoom = zoom.toDouble(),
bearing = bearing.toDouble(),
bearing = CameraBearing.bearingFromNativeHeading(bearing.toDouble()),
tilt = tilt.toDouble(),
paddings = paddings,
visibleRegion = null,
Expand Down
Loading