From 73eb4604f98ebe267c4e442347c5ab9122e81c4f Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Wed, 11 Nov 2026 22:29:04 -0800 Subject: [PATCH] Apply camera paddings and report fov on HERE The principal point is not used: it is not part of the flyTo animation and jumps when set. Paddings are emulated by moving the camera center and undone on read. HERE has no fov getter, so it is measured from the live camera: distanceToTarget times the px a sideways metre moves at the target gives the focal length (about 3550 px on TB520FU regardless of map size, orientation or density), and fov follows from the map height (44.6 in full-screen portrait, 28.6 in landscape). --- api/android-for-here.api | 3 + .../here/HereMapViewController.kt | 15 +++++ .../here/HereMapViewControllerCamera.kt | 56 ++++++++++++++++++- .../mapconductor/here/MapCameraPosition.kt | 1 + 4 files changed, 72 insertions(+), 3 deletions(-) diff --git a/api/android-for-here.api b/api/android-for-here.api index e2b5f04..309e9fb 100644 --- a/api/android-for-here.api +++ b/api/android-for-here.api @@ -156,6 +156,9 @@ public final class com.mapconductor.here.HereMapViewController extends com.mapco public final class com.mapconductor.here.HereMapViewController$Companion { } public final class com.mapconductor.here.HereMapViewControllerCameraKt { + public static final double viewportHeightDp(com.mapconductor.here.HereMapViewController); + public static final java.lang.Double verticalFov(com.mapconductor.here.HereMapViewController); + public static final com.mapconductor.core.map.MapCameraPosition toNativeCamera(com.mapconductor.here.HereMapViewController, com.mapconductor.core.map.MapCameraPosition); public static final void handleMoveCamera(com.mapconductor.here.HereMapViewController, com.mapconductor.core.map.MapCameraPosition); public static final void handleAnimateCamera(com.mapconductor.here.HereMapViewController, com.mapconductor.core.map.MapCameraPosition, long); public static final void handleFitBounds(com.mapconductor.here.HereMapViewController, com.mapconductor.core.features.GeoRectBounds, int); diff --git a/src/main/java/com/mapconductor/here/HereMapViewController.kt b/src/main/java/com/mapconductor/here/HereMapViewController.kt index 7e96fcf..e2e5d8d 100644 --- a/src/main/java/com/mapconductor/here/HereMapViewController.kt +++ b/src/main/java/com/mapconductor/here/HereMapViewController.kt @@ -1,6 +1,9 @@ package com.mapconductor.here import com.mapconductor.core.circle.CIRCLE_TILE_LAYER_ID +import com.mapconductor.core.map.CameraPaddingEmulation +import com.mapconductor.core.map.MapPaddings +import com.mapconductor.core.map.MapPaddingsInterface import com.mapconductor.core.circle.CircleTiler import com.mapconductor.core.circle.circleTileRasterLayerState import com.mapconductor.core.polygon.POLYGON_TILE_LAYER_ID @@ -77,6 +80,18 @@ class HereMapViewController( internal var markerAnimateStartListener: OnMarkerEventHandler? = null internal var markerAnimateEndListener: OnMarkerEventHandler? = null internal var lastRequestedCameraPosition: MapCameraPosition? = null + + /** + * 今カメラに付いているパディング(dp)。 + * + * HERE の principal point は使わない。flyTo のアニメーションに載らず、付けた瞬間に + * 画面が跳ぶため。代わりにカメラ中心をずらして再現し([CameraPaddingEmulation])、 + * 読むときに元へ戻すためにここで覚えておく。 + */ + internal var cameraPaddings: MapPaddingsInterface = MapPaddings.Zeros + + /** 最後に測れたカメラの焦点距離(px)。HERE は地図の大きさによらず一定。 */ + internal var focalLengthPx: Double? = null internal val cameraRequestGeneration = AtomicLong(0L) // HERE's MapCameraListener provides only continuous updates. Synthesize a "move end" after an idle window diff --git a/src/main/java/com/mapconductor/here/HereMapViewControllerCamera.kt b/src/main/java/com/mapconductor/here/HereMapViewControllerCamera.kt index 805c619..f90343c 100644 --- a/src/main/java/com/mapconductor/here/HereMapViewControllerCamera.kt +++ b/src/main/java/com/mapconductor/here/HereMapViewControllerCamera.kt @@ -11,8 +11,12 @@ import com.here.sdk.mapview.MapCameraAnimationFactory import com.here.sdk.mapview.MapMeasure import com.here.time.Duration import com.mapconductor.core.features.GeoRectBounds +import com.mapconductor.core.map.CameraPaddingEmulation import com.mapconductor.core.map.MapCameraPosition import com.mapconductor.core.map.VisibleRegion +import com.mapconductor.core.spherical.Spherical +import kotlin.math.atan +import kotlin.math.hypot import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -21,11 +25,52 @@ import kotlinx.coroutines.launch // HERE は「動き終わった」を通知しないので、更新が止まったところを // デバウンスで作っている。範囲制限もネイティブ API が無く、停止時に // 矩形内へクランプして再適用する。 + +/** 地図の高さ(dp)。パディングのエミュレーションで遠近を解くのに使う。 */ +internal fun HereMapViewController.viewportHeightDp(): Double { + val density = holder.mapView.resources.displayMetrics.density + return holder.mapView.height / density.toDouble() +} + +/** + * HERE のカメラの縦方向の視野角(度)。SDK に取得 API が無いので、今のカメラから測る。 + * + * ピンホールカメラでは、注視点で横に 1 m ずらすと `焦点距離 / 注視点までの距離` px 動く。 + * HERE は注視点までの距離([MapCamera.State.distanceToTargetInMeters])を返すので、 + * 横の 1 m が何 px かを投影で測れば焦点距離が出る。TB520FU では地図の大きさ・向き・ + * 画面密度によらず約 3550 px で、縦の視野角は縦長の全画面で約 45°、横長で約 29°。 + */ +internal fun HereMapViewController.verticalFov(): Double? { + val height = holder.mapView.height + if (height <= 0) return null + val state = holder.mapView.camera.state + val target = state.targetCoordinates.toGeoPoint() + val sideways = Spherical.computeOffset(target, 100.0, state.orientationAtTarget.bearing + 90.0) + val a = holder.mapView.geoToViewCoordinates(target.toGeoCoordinates()) + val b = holder.mapView.geoToViewCoordinates(sideways.toGeoCoordinates()) + if (a != null && b != null && state.distanceToTargetInMeters > 0) { + val pxPerMeter = hypot(b.x - a.x, b.y - a.y) / 100.0 + if (pxPerMeter > 0) focalLengthPx = state.distanceToTargetInMeters * pxPerMeter + } + val f = focalLengthPx ?: return null + return Math.toDegrees(2 * atan((height / 2.0) / f)) +} + +/** パディングを中心のずらしに置き換えたカメラ。paddings が null なら今のパディングを使い続ける。 */ +internal fun HereMapViewController.toNativeCamera(position: MapCameraPosition): MapCameraPosition { + position.paddings?.let { cameraPaddings = it } + return CameraPaddingEmulation.toNativeCamera( + position.copy(paddings = cameraPaddings), + verticalFov(), + viewportHeightDp(), + ) +} + internal fun HereMapViewController.handleMoveCamera(position: MapCameraPosition) { lastRequestedCameraPosition = position val request = cameraRequestGeneration.incrementAndGet() val camera = this.holder.mapView.camera - val adjustCameraUpdate = position.toMapCameraUpdate() + val adjustCameraUpdate = toNativeCamera(position).toMapCameraUpdate() camera.applyUpdate(adjustCameraUpdate) @@ -47,7 +92,7 @@ internal fun HereMapViewController.handleAnimateCamera( cameraRequestGeneration.incrementAndGet() val camera = this.holder.mapView.camera - val display = position.toHereDisplayCamera() + val display = toNativeCamera(position).toHereDisplayCamera() // bowFactor > 0: 最初にズームアウト → 到達時にズームイン // bowFactor < 0: 最初にズームイン → 到達時にズームアウト(ややレア) @@ -180,7 +225,12 @@ internal fun HereMapViewController.getMapCameraPosition(cameraState: MapCamera.S farRight = holder.fromScreenOffsetSync(Offset(mapWidth, 0.0f)), ) val logicalCamera = - HereCameraStateSnapshot(cameraState, lastRequestedCameraPosition?.tilt).toMapCameraPosition() + CameraPaddingEmulation.fromNativeCamera( + HereCameraStateSnapshot(cameraState, lastRequestedCameraPosition?.tilt).toMapCameraPosition(), + cameraPaddings, + verticalFov(), + viewportHeightDp(), + ) return@let logicalCamera.copy(visibleRegion = visibleRegion) } } diff --git a/src/main/java/com/mapconductor/here/MapCameraPosition.kt b/src/main/java/com/mapconductor/here/MapCameraPosition.kt index 94e9ead..395f9a1 100644 --- a/src/main/java/com/mapconductor/here/MapCameraPosition.kt +++ b/src/main/java/com/mapconductor/here/MapCameraPosition.kt @@ -72,6 +72,7 @@ fun MapCameraPosition.Companion.from(position: MapCameraPositionInterface): MapC tilt = position.tilt, paddings = position.paddings, visibleRegion = position.visibleRegion, + fov = position.fov, ) }