From 58b76f7b8e3edb01a1eaf4196796d02a0734ac26 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 Longdo Longdo Map API3 has no padding, so paddings are emulated by moving the camera center and undone when camera events come back. The holder's synchronous projection now centers on that moved camera, so InfoBubble and marker tracking stay aligned with padding. fov is 36.87, the MapLibre GL default the map renders with. --- api/android-for-longdo.api | 2 ++ .../com/mapconductor/longdo/LongdoMapView.kt | 21 +++++++++------ .../longdo/LongdoMapViewController.kt | 11 ++++++++ .../longdo/LongdoMapViewControllerCamera.kt | 26 +++++++++++++++++-- .../longdo/LongdoMapViewHolder.kt | 14 ++++++++-- 5 files changed, 62 insertions(+), 12 deletions(-) diff --git a/api/android-for-longdo.api b/api/android-for-longdo.api index 9a4b484..f79c883 100644 --- a/api/android-for-longdo.api +++ b/api/android-for-longdo.api @@ -123,7 +123,9 @@ public final class com.mapconductor.longdo.LongdoMapViewController extends com.m public final class com.mapconductor.longdo.LongdoMapViewController$Companion { } public final class com.mapconductor.longdo.LongdoMapViewControllerCameraKt { + public static final double LONGDO_VERTICAL_FOV; public static final boolean applyCameraRestrictionCorrectionIfNeeded(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.map.MapCameraPosition); + public static final double viewportHeightDp(com.mapconductor.longdo.LongdoMapViewController); public static final void handleMoveCamera(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.map.MapCameraPosition); public static final void handleAnimateCamera(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.map.MapCameraPosition, long); public static final void applyCamera(com.mapconductor.longdo.LongdoMapViewController, com.mapconductor.core.map.MapCameraPosition); diff --git a/src/main/java/com/mapconductor/longdo/LongdoMapView.kt b/src/main/java/com/mapconductor/longdo/LongdoMapView.kt index 35ec922..da074fa 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoMapView.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoMapView.kt @@ -39,6 +39,7 @@ import com.mapconductor.core.circle.CircleCapableInterface import com.mapconductor.core.features.GeoPoint import com.mapconductor.core.groundimage.GroundImageCapableInterface import com.mapconductor.core.map.CameraBearing +import com.mapconductor.core.map.CameraPaddingEmulation import com.mapconductor.core.map.LocalMapOverlayRegistry import com.mapconductor.core.map.LocalMapServiceRegistry import com.mapconductor.core.map.LocalMapViewController @@ -333,19 +334,23 @@ fun LongdoMapSurface( } } bridge.onCameraMove = cameraMove@{ lon, lat, zoom, bearing, tilt, bounds -> - val base = currentState.cameraPosition val region = bounds?.let { VisibleRegion(bounds = it, nearLeft = null, nearRight = null, farLeft = null, farRight = null) } + // Longdo が返す中心は画面中央。パディングを付けているなら、その中央の位置に直す。 val updated = - MapCameraPosition( - position = GeoPoint(latitude = lat, longitude = lon), - zoom = LongdoMapViewController.longdoZoomToCore(zoom), - bearing = CameraBearing.bearingFromNativeHeading(bearing), - tilt = tilt, - paddings = base.paddings, - visibleRegion = region, + CameraPaddingEmulation.fromNativeCamera( + MapCameraPosition( + position = GeoPoint(latitude = lat, longitude = lon), + zoom = LongdoMapViewController.longdoZoomToCore(zoom), + bearing = CameraBearing.bearingFromNativeHeading(bearing), + tilt = tilt, + visibleRegion = region, + ), + controller.cameraPaddings, + LONGDO_VERTICAL_FOV, + controller.viewportHeightDp(), ) // 範囲・ズーム制限に違反していれば矩形内へ引き戻す(Longdo にはネイティブの範囲制限 API が // 無いため)。android-sdk の HERE/ArcGIS/TomTom と同じく、補正した回は state 更新も diff --git a/src/main/java/com/mapconductor/longdo/LongdoMapViewController.kt b/src/main/java/com/mapconductor/longdo/LongdoMapViewController.kt index 4d4d8a5..c3c126f 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoMapViewController.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoMapViewController.kt @@ -11,7 +11,10 @@ import com.mapconductor.core.features.GeoRectBounds import com.mapconductor.core.groundimage.GroundImageCapableInterface 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.MarkerCapableInterface import com.mapconductor.core.marker.MarkerRenderingSupport @@ -245,6 +248,14 @@ class LongdoMapViewController( @Volatile internal var mapReady: Boolean = false + /** + * 今カメラに付いているパディング(dp)。 + * + * Longdo Map API3 にはパディングの口が無いので、カメラ中心をずらして再現し + * ([CameraPaddingEmulation])、読むときに元へ戻すためにここで覚えておく。 + */ + internal var cameraPaddings: MapPaddingsInterface = MapPaddings.Zeros + /** ready 前に要求された最後のカメラ位置。ready 時に適用する。 */ internal var pendingCameraPosition: MapCameraPosition? = null diff --git a/src/main/java/com/mapconductor/longdo/LongdoMapViewControllerCamera.kt b/src/main/java/com/mapconductor/longdo/LongdoMapViewControllerCamera.kt index 2c7f3e6..e2ac41b 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoMapViewControllerCamera.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoMapViewControllerCamera.kt @@ -3,6 +3,7 @@ package com.mapconductor.longdo import com.mapconductor.core.features.GeoPointInterface import com.mapconductor.core.features.GeoRectBounds import com.mapconductor.core.map.CameraBearing +import com.mapconductor.core.map.CameraPaddingEmulation import com.mapconductor.core.map.MapCameraPosition import com.mapconductor.core.spherical.Spherical import org.json.JSONObject @@ -26,7 +27,20 @@ internal fun LongdoMapViewController.applyCameraRestrictionCorrectionIfNeeded(cu return true } +/** + * Longdo の地図(MapLibre GL)の縦方向の視野角(度)。MapLibre の既定値で、地図の大きさに + * よらず一定(焦点距離 = 地図の高さ × 1.5)。 + */ +internal const val LONGDO_VERTICAL_FOV = 36.87 + +/** 地図の高さ(dp)。パディングのエミュレーションで遠近を解くのに使う。 */ +internal fun LongdoMapViewController.viewportHeightDp(): Double { + val density = holder.mapView.resources.displayMetrics.density + return holder.mapView.height / density.toDouble() +} + internal fun LongdoMapViewController.handleMoveCamera(position: MapCameraPosition) { + position.paddings?.let { cameraPaddings = it } if (mapReady) applyCamera(position) else pendingCameraPosition = position } @@ -37,6 +51,7 @@ internal fun LongdoMapViewController.handleAnimateCamera( // Longdo の JS ブリッジでは中心(location)とズーム(zoom)が別コマンドで、双方をアニメーション指定 // すると後発のズームがパンのアニメーションを打ち切ってしまい中心が移動しない。カメラ同期では同期先が // ソース側の連続イベントを追って滑らかに追従するため、ここでは瞬時に確定位置へ適用する。 + position.paddings?.let { cameraPaddings = it } if (mapReady) applyCamera(position) else pendingCameraPosition = position } @@ -52,11 +67,18 @@ internal fun LongdoMapViewController.handleAnimateCamera( * いずれかをアニメーション指定すると後続コマンドが直前のアニメーションを打ち切ってしまう。 */ internal fun LongdoMapViewController.applyCamera(position: MapCameraPosition) { - val native = nativeCameraFor(position) + // パディングは中心のずらしで再現する(Longdo にパディングの口が無いため)。 + val padded = + CameraPaddingEmulation.toNativeCamera( + position.copy(paddings = cameraPaddings), + LONGDO_VERTICAL_FOV, + viewportHeightDp(), + ) + val native = nativeCameraFor(padded) runCatching { longdoMap.call("location", listOf(native.target.toLongdoLocation(), false)) {} longdoMap.call("zoom", listOf(native.longdoZoom, false)) {} - longdoMap.call("rotate", listOf(CameraBearing.toNativeHeading(position.bearing), false)) {} + longdoMap.call("rotate", listOf(CameraBearing.toNativeHeading(padded.bearing), false)) {} longdoMap.call("pitch", listOf(native.pitch)) {} } } diff --git a/src/main/java/com/mapconductor/longdo/LongdoMapViewHolder.kt b/src/main/java/com/mapconductor/longdo/LongdoMapViewHolder.kt index d26ea44..7673d5c 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoMapViewHolder.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoMapViewHolder.kt @@ -5,6 +5,7 @@ import com.longdo.sdk3.LongdoMap import com.mapconductor.core.ResourceProvider import com.mapconductor.core.features.GeoPoint import com.mapconductor.core.features.GeoPointInterface +import com.mapconductor.core.map.CameraPaddingEmulation import com.mapconductor.core.map.MapCameraPosition import com.mapconductor.core.map.MapViewHolderInterface import com.mapconductor.core.projection.WebMercatorScreenProjection @@ -32,6 +33,15 @@ class LongdoMapViewHolder( */ internal var cameraProvider: (() -> MapCameraPosition?)? = null + /** + * 投影の中心にするカメラ。パディングを付けたカメラの position はパディング中央なので、 + * 画面中央に来る点(ネイティブへ渡したカメラ中心)へ戻してから使う。 + */ + private fun screenCenteredCamera(heightDp: Float): MapCameraPosition? { + val camera = cameraProvider?.invoke() ?: return null + return CameraPaddingEmulation.toNativeCamera(camera, LONGDO_VERTICAL_FOV, heightDp.toDouble()) + } + /** * 地理座標 → 画面座標(**端末ピクセル**)。カメラ未確定(地図の準備前)なら null。 * @@ -41,8 +51,8 @@ class LongdoMapViewHolder( * 中心からのずれが density 分だけ小さくなり、マーカーと吹き出しがずれる。 */ override fun toScreenOffset(position: GeoPointInterface): Offset? { - val camera = cameraProvider?.invoke() ?: return null val density = ResourceProvider.getDensity() + val camera = screenCenteredCamera(longdoMap.height / density) ?: return null val offsetDp = WebMercatorScreenProjection.toScreenOffset( position = position, @@ -58,8 +68,8 @@ class LongdoMapViewHolder( * こちらを使う。非同期版は基底の既定実装がここへ委譲する。 */ override fun fromScreenOffsetSync(offset: Offset): GeoPoint? { - val camera = cameraProvider?.invoke() ?: return null val density = ResourceProvider.getDensity() + val camera = screenCenteredCamera(longdoMap.height / density) ?: return null return WebMercatorScreenProjection.fromScreenOffset( offset = Offset(offset.x / density, offset.y / density), camera = camera,