Skip to content

Make bearing a clockwise map rotation #11

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

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
13 changes: 7 additions & 6 deletions src/main/java/com/mapconductor/mapbox/MapCameraPosition.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.mapbox.maps.CameraState
import com.mapbox.maps.EdgeInsets
import com.mapconductor.core.features.GeoPoint
import com.mapconductor.core.features.GeoPointInterface
import com.mapconductor.core.map.CameraBearing
import com.mapconductor.core.map.MapCameraPosition
import com.mapconductor.core.map.MapCameraPositionInterface
import com.mapconductor.core.map.MapPaddingsInterface
Expand All @@ -30,7 +31,7 @@ fun MapCameraPosition.toCameraOptions(): CameraOptions {
.center(GeoPoint.from(position).toPoint())
.zoom(ZoomAltitudeConverter.googleZoomToMapboxZoom(zoom))
.pitch(tilt)
.bearing(bearing)
.bearing(CameraBearing.toNativeHeading(bearing))
// TODO:
// .padding(paddings?.toEdgeInsects())
.build()
Expand All @@ -43,15 +44,15 @@ fun MapCameraPosition.toCameraOptions(): CameraOptions {
val mapboxZoomForAltitude = ZoomAltitudeConverter.googleZoomToMapboxZoom(zoom)
val altitude = converter.zoomLevelToAltitude(mapboxZoomForAltitude, 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 mapboxZoom = converter.altitudeToZoomLevel(altitude / cos(tiltAbsRad), target.latitude, 0.0)

return CameraOptions
.Builder()
.center(target.toPoint())
.zoom(mapboxZoom)
.pitch(tiltAbsDeg)
.bearing(bearing)
.bearing(CameraBearing.toNativeHeading(bearing))
// TODO:
// .padding(paddings?.toEdgeInsects())
.build()
Expand All @@ -63,7 +64,7 @@ fun MapCameraPosition.toCameraState(): CameraState =
GeoPoint.from(position).toPoint(),
EdgeInsets(0.0, 0.0, 0.0, 0.0),
ZoomAltitudeConverter.googleZoomToMapboxZoom(zoom),
bearing,
CameraBearing.toNativeHeading(bearing),
tilt,
)

Expand Down Expand Up @@ -130,7 +131,7 @@ private fun toMapCameraPosition(
return MapCameraPosition(
position = center,
zoom = ZoomAltitudeConverter.mapboxZoomToGoogleZoom(mapboxZoom),
bearing = bearing,
bearing = CameraBearing.bearingFromNativeHeading(bearing),
tilt = pitch,
paddings = paddings,
visibleRegion = visibleRegion,
Expand All @@ -148,7 +149,7 @@ private fun toMapCameraPosition(
return MapCameraPosition(
position = originalCenter,
zoom = ZoomAltitudeConverter.mapboxZoomToGoogleZoom(originalMapboxZoom),
bearing = bearing,
bearing = CameraBearing.bearingFromNativeHeading(bearing),
tilt = -pitchAbsDeg,
paddings = paddings,
visibleRegion = visibleRegion,
Expand Down
Loading