Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 11 additions & 2 deletions api/android-for-mappls.api
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,27 @@ public final class com.mapconductor.mappls.GeoRectBoundsKt {
public static final com.mapconductor.core.features.GeoRectBounds toGeoRectBounds(com.mappls.sdk.maps.geometry.LatLngBounds);
}
public final class com.mapconductor.mappls.MapCameraPositionKt {
public static final double MAPPLS_VERTICAL_FOV;
public static final double[] toMapplsPadding(com.mapconductor.core.map.MapPaddingsInterface, float);
public static final com.mapconductor.core.map.MapPaddings toMapPaddings(double[], float);
public static final com.mappls.sdk.maps.camera.CameraPosition toCameraPosition(com.mapconductor.core.map.MapCameraPosition);
public static final com.mappls.sdk.maps.camera.CameraPosition toCameraPosition(com.mapconductor.core.map.MapCameraPosition, java.lang.Float);
public static final com.mapconductor.core.map.MapCameraPosition from(com.mapconductor.core.map.MapCameraPosition$Companion, com.mapconductor.core.map.MapCameraPositionInterface);
public static final com.mapconductor.core.map.MapCameraPosition toMapCameraPosition(com.mappls.sdk.maps.camera.CameraPosition);
public static final com.mapconductor.core.map.MapCameraPosition toMapCameraPosition(com.mappls.sdk.maps.camera.CameraPosition, java.lang.Double);
public static final com.mapconductor.core.map.MapCameraPosition toMapCameraPosition(com.mappls.sdk.maps.camera.CameraPosition, java.lang.Double, java.lang.Float);
}
public final class com.mapconductor.mappls.MapplsCameraStateSnapshot {
public com.mapconductor.mappls.MapplsCameraStateSnapshot(com.mappls.sdk.maps.camera.CameraPosition, java.lang.Double);
public com.mapconductor.mappls.MapplsCameraStateSnapshot(com.mappls.sdk.maps.camera.CameraPosition, java.lang.Double, java.lang.Float);
public com.mapconductor.mappls.MapplsCameraStateSnapshot(com.mappls.sdk.maps.camera.CameraPosition, java.lang.Double, java.lang.Float, int, kotlin.jvm.internal.DefaultConstructorMarker);
public final com.mappls.sdk.maps.camera.CameraPosition getCameraPosition();
public final java.lang.Double getLogicalTiltHint();
public final java.lang.Float getDensity();
public final com.mapconductor.core.map.MapCameraPosition toMapCameraPosition();
public final com.mappls.sdk.maps.camera.CameraPosition component1();
public final java.lang.Double component2();
public final com.mapconductor.mappls.MapplsCameraStateSnapshot copy(com.mappls.sdk.maps.camera.CameraPosition, java.lang.Double);
public final java.lang.Float component3();
public final com.mapconductor.mappls.MapplsCameraStateSnapshot copy(com.mappls.sdk.maps.camera.CameraPosition, java.lang.Double, java.lang.Float);
public java.lang.String toString();
public int hashCode();
public boolean equals(java.lang.Object);
Expand Down Expand Up @@ -171,6 +179,7 @@ public final class com.mapconductor.mappls.MapplsViewController extends com.mapc
}
public final class com.mapconductor.mappls.MapplsViewControllerCameraKt {
public static final com.mapconductor.core.map.MapCameraPosition readLogicalCameraPosition(com.mapconductor.mappls.MapplsViewController);
public static final float density(com.mapconductor.mappls.MapplsViewController);
public static final com.mapconductor.core.map.MapCameraPosition getMapCameraPosition(com.mapconductor.mappls.MapplsViewController, com.mapconductor.core.map.MapCameraPositionInterface);
public static final void handleMoveCamera(com.mapconductor.mappls.MapplsViewController, com.mapconductor.core.map.MapCameraPosition);
public static final void handleAnimateCamera(com.mapconductor.mappls.MapplsViewController, com.mapconductor.core.map.MapCameraPosition, long);
Expand Down
59 changes: 52 additions & 7 deletions src/main/java/com/mapconductor/mappls/MapCameraPosition.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ 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
import com.mapconductor.core.map.MapPaddingsInterface
import com.mapconductor.core.spherical.Spherical
import com.mapconductor.mappls.zoom.ZoomAltitudeConverter
import com.mappls.sdk.maps.camera.CameraPosition
Expand All @@ -12,19 +14,48 @@ import kotlin.math.cos
import kotlin.math.tan

private val converter = ZoomAltitudeConverter()

/**
* Mappls のカメラの縦方向の視野角(度)。Mappls は MapLibre Native 派生で、既定値は地図の大きさに
* よらず一定(焦点距離 = 地図の高さ × 1.5)。TB520FU で 36.9° を実測。
*/
internal const val MAPPLS_VERTICAL_FOV = 36.87

/** dp のパディング → Mappls の px のパディング(left, top, right, bottom)。 */
internal fun MapPaddingsInterface.toMapplsPadding(density: Float): DoubleArray =
doubleArrayOf(left * density, top * density, right * density, bottom * density)

/** Mappls の px のパディング(left, top, right, bottom)→ dp のパディング。 */
internal fun DoubleArray.toMapPaddings(density: Float): MapPaddings? {
if (size < 4 || density <= 0f) return null
return MapPaddings(
top = this[1] / density,
left = this[0] / density,
bottom = this[3] / density,
right = this[2] / density,
)
}

private const val NEGATIVE_TILT_TARGET_DISTANCE_SCALE = 1.83
private const val NEGATIVE_TILT_ZOOM_OFFSET_AT_MAX_TILT = -0.9

fun MapCameraPosition.toCameraPosition(): CameraPosition {
fun MapCameraPosition.toCameraPosition(): CameraPosition = toCameraPosition(density = null)

/**
* [density] があれば [MapCameraPosition.paddings] を Mappls のパディングとして渡す。
* Mappls はパディングを除いた領域の中央にカメラの中心を置き、tilt の遠近もエンジンが解く。
* Mappls のパディングは次に変えるまで残るので、null(未指定)のときは渡さない。
*/
internal fun MapCameraPosition.toCameraPosition(density: Float?): CameraPosition {
val padding = if (density != null) paddings?.toMapplsPadding(density) else null
if (tilt >= 0) {
return CameraPosition
.Builder()
.target(GeoPoint.from(position).toLatLng())
.zoom(ZoomAltitudeConverter.googleZoomToMapplsZoom(zoom))
.tilt(tilt)
.bearing(CameraBearing.toNativeHeading(bearing))
// TODO:
// .padding(paddings?.toEdgeInsects())
.apply { padding?.let { padding(it) } }
.build()
} else {
// tilt < 0: Mappls cannot represent an upward pitch directly.
Expand All @@ -47,8 +78,7 @@ fun MapCameraPosition.toCameraPosition(): CameraPosition {
.zoom(ZoomAltitudeConverter.googleZoomToMapplsZoom(adjustedZoom))
.tilt(tiltAbsDeg)
.bearing(CameraBearing.toNativeHeading(bearing))
// TODO:
// .padding(paddings?.toEdgeInsects())
.apply { padding?.let { padding(it) } }
.build()
}
}
Expand All @@ -62,7 +92,9 @@ fun MapCameraPosition.Companion.from(cameraPosition: MapCameraPositionInterface)
zoom = cameraPosition.zoom,
bearing = cameraPosition.bearing,
tilt = cameraPosition.tilt,
paddings = cameraPosition.paddings,
visibleRegion = cameraPosition.visibleRegion,
fov = cameraPosition.fov,
)
}

Expand All @@ -71,11 +103,20 @@ fun CameraPosition.toMapCameraPosition() = toMapCameraPosition(logicalTiltHint =
internal data class MapplsCameraStateSnapshot(
val cameraPosition: CameraPosition,
val logicalTiltHint: Double?,
val density: Float? = null,
) {
fun toMapCameraPosition(): MapCameraPosition = cameraPosition.toMapCameraPosition(logicalTiltHint)
fun toMapCameraPosition(): MapCameraPosition = cameraPosition.toMapCameraPosition(logicalTiltHint, density)
}

internal fun CameraPosition.toMapCameraPosition(logicalTiltHint: Double?): MapCameraPosition {
internal fun CameraPosition.toMapCameraPosition(logicalTiltHint: Double?): MapCameraPosition =
toMapCameraPosition(logicalTiltHint, density = null)

/** [density] があれば Mappls のパディングを dp に直して paddings として返す。 */
internal fun CameraPosition.toMapCameraPosition(
logicalTiltHint: Double?,
density: Float?,
): MapCameraPosition {
val paddings = density?.let { d -> padding?.toMapPaddings(d) } ?: MapPaddings.Zeros
val pitch = tilt
val pitchAbsDeg = abs(pitch).coerceIn(0.0, 60.0)

Expand All @@ -85,7 +126,9 @@ internal fun CameraPosition.toMapCameraPosition(logicalTiltHint: Double?): MapCa
zoom = ZoomAltitudeConverter.mapplsZoomToGoogleZoom(zoom),
bearing = CameraBearing.bearingFromNativeHeading(bearing),
tilt = pitch,
paddings = paddings,
visibleRegion = null,
fov = MAPPLS_VERTICAL_FOV,
)
}

Expand All @@ -107,6 +150,8 @@ internal fun CameraPosition.toMapCameraPosition(logicalTiltHint: Double?): MapCa
zoom = originalGoogleZoom,
bearing = CameraBearing.bearingFromNativeHeading(bear),
tilt = -pitchAbsDeg,
paddings = paddings,
visibleRegion = null,
fov = MAPPLS_VERTICAL_FOV,
)
}
2 changes: 1 addition & 1 deletion src/main/java/com/mapconductor/mappls/MapplsMapView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ fun MapplsMapView(
modifier = modifier,
viewProvider = {
val cameraPosition =
state.cameraPosition.toCameraPosition()
state.cameraPosition.toCameraPosition(context.resources.displayMetrics.density)
val mapInitOptions =
MapplsMapOptions
.createFromAttributes(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ internal fun MapplsViewController.readLogicalCameraPosition(): MapCameraPosition
MapplsCameraStateSnapshot(
cameraPosition = holder.map.cameraPosition,
logicalTiltHint = lastLogicalCameraPosition?.tilt,
density = density(),
).toMapCameraPosition()

internal fun MapplsViewController.density(): Float = holder.mapView.resources.displayMetrics.density

internal fun MapplsViewController.getMapCameraPosition(camera: MapCameraPositionInterface): MapCameraPosition? {
// 4 隅の逆投影は全プロバイダ共通なのでコアの buildVisibleRegion を使う。
val visibleRegion = holder.buildVisibleRegion() ?: return null
Expand All @@ -31,7 +34,7 @@ internal fun MapplsViewController.getMapCameraPosition(camera: MapCameraPosition
internal fun MapplsViewController.handleMoveCamera(position: MapCameraPosition) {
lastLogicalCameraPosition = position
mainCoroutine.launch {
val cameraPos = position.toCameraPosition()
val cameraPos = position.toCameraPosition(density())
val cameraUpdate =
CameraUpdateFactory
.newCameraPosition(cameraPos)
Expand All @@ -46,7 +49,7 @@ internal fun MapplsViewController.handleAnimateCamera(
) {
lastLogicalCameraPosition = position
mainCoroutine.launch {
val cameraPos = position.toCameraPosition()
val cameraPos = position.toCameraPosition(density())
val cameraUpdate =
CameraUpdateFactory
.newCameraPosition(cameraPos)
Expand Down
Loading