diff --git a/api/android-for-tomtom.api b/api/android-for-tomtom.api index eaa0c3a..2513d62 100644 --- a/api/android-for-tomtom.api +++ b/api/android-for-tomtom.api @@ -8,6 +8,7 @@ public final class com.mapconductor.tomtom.GeoRectBoundsKt { public static final com.mapconductor.core.features.GeoRectBounds toGeoRectBounds(com.tomtom.sdk.location.GeoBoundingBox); } public final class com.mapconductor.tomtom.MapCameraPositionKt { + public static final double TOMTOM_VERTICAL_FOV; public static final com.tomtom.sdk.map.display.camera.CameraOptions toCameraOptions(com.mapconductor.core.map.MapCameraPosition); 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.tomtom.sdk.map.display.camera.CameraPosition, com.mapconductor.core.map.MapPaddingsInterface, java.lang.Double); @@ -106,6 +107,8 @@ public final class com.mapconductor.tomtom.TomTomMapViewController extends com.m public final class com.mapconductor.tomtom.TomTomMapViewController$Companion { } public final class com.mapconductor.tomtom.TomTomMapViewControllerCameraKt { + public static final double viewportHeightDp(com.mapconductor.tomtom.TomTomMapViewController); + public static final com.mapconductor.core.map.MapCameraPosition toNativeCamera(com.mapconductor.tomtom.TomTomMapViewController, com.mapconductor.core.map.MapCameraPosition); public static final void handleMoveCamera(com.mapconductor.tomtom.TomTomMapViewController, com.mapconductor.core.map.MapCameraPosition); public static final void handleAnimateCamera(com.mapconductor.tomtom.TomTomMapViewController, com.mapconductor.core.map.MapCameraPosition, long); public static final void handleFitBounds(com.mapconductor.tomtom.TomTomMapViewController, com.mapconductor.core.features.GeoRectBounds, int); diff --git a/src/main/java/com/mapconductor/tomtom/MapCameraPosition.kt b/src/main/java/com/mapconductor/tomtom/MapCameraPosition.kt index 1f29be4..38a3941 100644 --- a/src/main/java/com/mapconductor/tomtom/MapCameraPosition.kt +++ b/src/main/java/com/mapconductor/tomtom/MapCameraPosition.kt @@ -70,6 +70,12 @@ fun MapCameraPosition.toCameraOptions(): CameraOptions { ) } +/** + * TomTom のカメラの縦方向の視野角(度)。SDK に取得 API は無い。地図の大きさによらず一定で、 + * TB520FU の縦・横で 45° を実測した(焦点距離 ≈ 地図の高さ × 1.21)。 + */ +internal const val TOMTOM_VERTICAL_FOV = 45.0 + fun MapCameraPosition.Companion.from(position: MapCameraPositionInterface): MapCameraPosition = when (position) { is MapCameraPosition -> position @@ -81,6 +87,7 @@ fun MapCameraPosition.Companion.from(position: MapCameraPositionInterface): MapC tilt = position.tilt, paddings = position.paddings, visibleRegion = position.visibleRegion, + fov = position.fov, ) } diff --git a/src/main/java/com/mapconductor/tomtom/TomTomMapViewController.kt b/src/main/java/com/mapconductor/tomtom/TomTomMapViewController.kt index bd8bb17..b58223f 100644 --- a/src/main/java/com/mapconductor/tomtom/TomTomMapViewController.kt +++ b/src/main/java/com/mapconductor/tomtom/TomTomMapViewController.kt @@ -8,7 +8,10 @@ import com.mapconductor.core.features.GeoPointInterface import com.mapconductor.core.features.GeoRectBounds import com.mapconductor.core.groundimage.GroundImageState import com.mapconductor.core.groundimage.OnGroundImageEventHandler +import com.mapconductor.core.map.CameraPaddingEmulation import com.mapconductor.core.map.MapCameraPosition +import com.mapconductor.core.map.MapPaddings +import com.mapconductor.core.map.MapPaddingsInterface import com.mapconductor.core.map.MapUISettings import com.mapconductor.core.marker.DefaultMarkerEventController import com.mapconductor.core.marker.MarkerAnimationOverlayHost @@ -206,6 +209,15 @@ class TomTomMapViewController internal constructor( // カメラ状態の読み戻し時に元の負tilt を復元するヒントとして保持する(MapLibre と同方針)。 internal var lastLogicalCameraPosition: MapCameraPosition? = null + /** + * 今カメラに付いているパディング(dp)。 + * + * `MapController.setPadding` は使わない。付けた瞬間に画面がずれてアニメーションの + * 始まりが跳ぶため。代わりにカメラ中心をずらして再現し([CameraPaddingEmulation])、 + * 読むときに元へ戻すためにここで覚えておく。 + */ + internal var cameraPaddings: MapPaddingsInterface = MapPaddings.Zeros + override suspend fun clearOverlays() { markerController.clear() polylineController.clear() diff --git a/src/main/java/com/mapconductor/tomtom/TomTomMapViewControllerCamera.kt b/src/main/java/com/mapconductor/tomtom/TomTomMapViewControllerCamera.kt index 6ede79e..521df29 100644 --- a/src/main/java/com/mapconductor/tomtom/TomTomMapViewControllerCamera.kt +++ b/src/main/java/com/mapconductor/tomtom/TomTomMapViewControllerCamera.kt @@ -1,11 +1,29 @@ package com.mapconductor.tomtom import com.mapconductor.core.features.GeoRectBounds +import com.mapconductor.core.map.CameraPaddingEmulation import com.mapconductor.core.map.MapCameraPosition import com.mapconductor.core.map.buildVisibleRegion +import kotlin.math.abs import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.launch +/** 地図の高さ(dp)。パディングのエミュレーションで遠近を解くのに使う。 */ +internal fun TomTomMapViewController.viewportHeightDp(): Double { + val density = holder.mapView.resources.displayMetrics.density + return holder.mapView.height / density.toDouble() +} + +/** パディングを中心のずらしに置き換えたカメラ。paddings が null なら今のパディングを使い続ける。 */ +internal fun TomTomMapViewController.toNativeCamera(position: MapCameraPosition): MapCameraPosition { + position.paddings?.let { cameraPaddings = it } + return CameraPaddingEmulation.toNativeCamera( + position.copy(paddings = cameraPaddings), + TOMTOM_VERTICAL_FOV, + viewportHeightDp(), + ) +} + /** * カメラの読み書きと、移動中・停止時の通知。 */ @@ -14,7 +32,7 @@ internal fun TomTomMapViewController.handleMoveCamera(position: MapCameraPositio lastLogicalCameraPosition = position mainCoroutine.launch { if (destroyed) return@launch - holder.map.moveCamera(position.toCameraOptions()) + holder.map.moveCamera(toNativeCamera(position).toCameraOptions()) } } @@ -27,7 +45,7 @@ internal fun TomTomMapViewController.handleAnimateCamera( mainCoroutine.launch { if (destroyed) return@launch holder.map.animateCamera( - position.toCameraOptions(), + toNativeCamera(position).toCameraOptions(), duration.milliseconds, ) } @@ -76,6 +94,7 @@ internal fun TomTomMapViewController.onCameraChangeInternal() { /** カメラ停止時(steady リスナーから配線)。 */ internal fun TomTomMapViewController.onCameraSteadyInternal() { cameraMovingStarted = false + if (correctPaddedTiltIfClamped()) return val mapCameraPosition = getMapCameraPosition() // 範囲・ズーム制限に違反していれば矩形内へ引き戻す(TomTom はネイティブの範囲制限 API が無いため)。 // 再適用すると再度 steady が発火し、そこでは補正不要になり通常フローへ進む。 @@ -87,10 +106,34 @@ internal fun TomTomMapViewController.onCameraSteadyInternal() { emitCameraMoveEnd(mapCameraPosition) } +/** + * TomTom はズームに応じて tilt を抑える(ズーム 15 で約 42°)。パディングを中心のずらしで + * 再現しているので、要求した tilt で解いた中心のままだと、パディング中央からずれる + * (tilt 60° の要求で 130px)。止まったところで実際の tilt を見て、違っていれば + * その tilt で解き直して置き直す。置き直したら true。 + */ +private fun TomTomMapViewController.correctPaddedTiltIfClamped(): Boolean { + val requested = lastLogicalCameraPosition ?: return false + if (requested.tilt <= 0.0) return false + val paddings = cameraPaddings + if (paddings.top == 0.0 && paddings.left == 0.0 && paddings.bottom == 0.0 && paddings.right == 0.0) return false + val actualTilt = holder.map.cameraPosition.tilt + if (abs(actualTilt - requested.tilt) < TILT_CLAMP_TOLERANCE_DEG) return false + handleMoveCamera(requested.copy(tilt = actualTilt)) + return true +} + +private const val TILT_CLAMP_TOLERANCE_DEG = 0.5 + internal fun TomTomMapViewController.getMapCameraPosition(): MapCameraPosition { val camera = - holder.map.cameraPosition.toMapCameraPosition( - logicalTiltHint = lastLogicalCameraPosition?.tilt, + CameraPaddingEmulation.fromNativeCamera( + holder.map.cameraPosition.toMapCameraPosition( + logicalTiltHint = lastLogicalCameraPosition?.tilt, + ), + cameraPaddings, + TOMTOM_VERTICAL_FOV, + viewportHeightDp(), ) // 画面四隅を投影して visibleRegion(ビューポート)を構築する。 // これが無いと marker-clustering がビューポートを算出できずクラスタが一切描画されない