From 433b031cd73e98fe740bab5f55eec6d6a59406c7 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 Google Maps GoogleMap.setPadding is not used: it shifts the view the moment it is set, so an animated move jumps at the start, and it also moves the logo and controls. Paddings are emulated by moving the camera center with CameraPaddingEmulation and undone when the camera is read. fov is 30 (Google has no API for it; measured 30 on TB520FU portrait, landscape and half size, unlike the ~25 of the JS vector map). --- api/android-for-googlemaps.api | 3 ++ .../googlemaps/GoogleMapViewController.kt | 13 ++++++++ .../GoogleMapViewControllerCamera.kt | 30 +++++++++++++++++-- .../googlemaps/MapCameraPosition.kt | 9 ++++++ 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/api/android-for-googlemaps.api b/api/android-for-googlemaps.api index 1d47c50..627172f 100644 --- a/api/android-for-googlemaps.api +++ b/api/android-for-googlemaps.api @@ -99,6 +99,8 @@ public final class com.mapconductor.googlemaps.GoogleMapViewController extends c public final class com.mapconductor.googlemaps.GoogleMapViewController$Companion { } public final class com.mapconductor.googlemaps.GoogleMapViewControllerCameraKt { + public static final double viewportHeightDp(com.mapconductor.googlemaps.GoogleMapViewController); + public static final com.mapconductor.core.map.MapCameraPosition toNativeCamera(com.mapconductor.googlemaps.GoogleMapViewController, com.mapconductor.core.map.MapCameraPosition); public static final void handleMoveCamera(com.mapconductor.googlemaps.GoogleMapViewController, com.mapconductor.core.map.MapCameraPosition); public static final void handleAnimateCamera(com.mapconductor.googlemaps.GoogleMapViewController, com.mapconductor.core.map.MapCameraPosition, long); public static final void handleFitBounds(com.mapconductor.googlemaps.GoogleMapViewController, com.mapconductor.core.features.GeoRectBounds, int); @@ -178,6 +180,7 @@ public final class com.mapconductor.googlemaps.LatLngInterpolationCache { public final void put(java.lang.String, java.util.List); } public final class com.mapconductor.googlemaps.MapCameraPositionKt { + public static final double GOOGLE_VERTICAL_FOV; public static final com.google.android.gms.maps.model.CameraPosition toCameraPosition(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.google.android.gms.maps.model.CameraPosition, com.mapconductor.core.map.MapPaddingsInterface); diff --git a/src/main/java/com/mapconductor/googlemaps/GoogleMapViewController.kt b/src/main/java/com/mapconductor/googlemaps/GoogleMapViewController.kt index e3ac6c2..afe741b 100644 --- a/src/main/java/com/mapconductor/googlemaps/GoogleMapViewController.kt +++ b/src/main/java/com/mapconductor/googlemaps/GoogleMapViewController.kt @@ -21,6 +21,9 @@ import com.mapconductor.core.groundimage.GroundImageState import com.mapconductor.core.groundimage.OnGroundImageEventHandler import com.mapconductor.core.map.CameraRestriction import com.mapconductor.core.map.MapCameraPosition +import com.mapconductor.core.map.CameraPaddingEmulation +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 @@ -75,6 +78,16 @@ class GoogleMapViewController internal constructor( internal val markerEventControllers = mutableListOf>() private val _mapLoadedState = MutableStateFlow(false) val mapLoadedState: StateFlow = _mapLoadedState + + /** + * 今カメラに付いているパディング(dp)。 + * + * `GoogleMap.setPadding` は使わない。付けた瞬間に画面がずれてアニメーションの始まりが + * 跳ぶうえ、ロゴやコントロールまで動くため。代わりにカメラ中心をずらして再現し + * ([CameraPaddingEmulation])、読むときに元へ戻すためにここで覚えておく。 + */ + internal var cameraPaddings: MapPaddingsInterface = MapPaddings.Zeros + internal var markerClickListener: OnMarkerEventHandler? = null internal var markerDragStartListener: OnMarkerEventHandler? = null internal var markerDragListener: OnMarkerEventHandler? = null diff --git a/src/main/java/com/mapconductor/googlemaps/GoogleMapViewControllerCamera.kt b/src/main/java/com/mapconductor/googlemaps/GoogleMapViewControllerCamera.kt index 89be439..c1a3287 100644 --- a/src/main/java/com/mapconductor/googlemaps/GoogleMapViewControllerCamera.kt +++ b/src/main/java/com/mapconductor/googlemaps/GoogleMapViewControllerCamera.kt @@ -3,6 +3,7 @@ package com.mapconductor.googlemaps import com.google.android.gms.maps.CameraUpdateFactory import com.google.android.gms.maps.GoogleMap.CancelableCallback import com.mapconductor.core.features.GeoRectBounds +import com.mapconductor.core.map.CameraPaddingEmulation import com.mapconductor.core.map.CameraRestriction import com.mapconductor.core.map.MapCameraPosition import com.mapconductor.core.map.VisibleRegion @@ -11,9 +12,26 @@ import kotlinx.coroutines.launch // カメラの適用と、Google Maps からのカメライベントの受け口。 // Google Maps だけは範囲制限もズーム制限もネイティブ API があるので、 // 他プロバイダのような停止時クランプは要らない。 + +/** 地図の高さ(dp)。パディングのエミュレーションで遠近を解くのに使う。 */ +internal fun GoogleMapViewController.viewportHeightDp(): Double { + val density = holder.mapView.resources.displayMetrics.density + return holder.mapView.height / density.toDouble() +} + +/** パディングを中心のずらしに置き換えたカメラ。paddings が null なら今のパディングを使い続ける。 */ +internal fun GoogleMapViewController.toNativeCamera(position: MapCameraPosition): MapCameraPosition { + position.paddings?.let { cameraPaddings = it } + return CameraPaddingEmulation.toNativeCamera( + position.copy(paddings = cameraPaddings), + GOOGLE_VERTICAL_FOV, + viewportHeightDp(), + ) +} + internal fun GoogleMapViewController.handleMoveCamera(position: MapCameraPosition) { mainCoroutine.launch { - val dstCameraPosition = position.toCameraPosition() + val dstCameraPosition = toNativeCamera(position).toCameraPosition() val cameraUpdate = CameraUpdateFactory.newCameraPosition(dstCameraPosition) holder.map.moveCamera(cameraUpdate) } @@ -23,8 +41,8 @@ internal fun GoogleMapViewController.handleAnimateCamera( position: MapCameraPosition, duration: Long, ) { - val dstCameraPosition = position.toCameraPosition() mainCoroutine.launch { + val dstCameraPosition = toNativeCamera(position).toCameraPosition() val cameraUpdate = CameraUpdateFactory.newCameraPosition(dstCameraPosition) holder.map.animateCamera( cameraUpdate, @@ -89,7 +107,13 @@ internal fun GoogleMapViewController.handleCameraMoveCanceled() { } internal fun GoogleMapViewController.getMapCameraPosition(): MapCameraPosition { - val camera = holder.map.cameraPosition.toMapCameraPosition() + val camera = + CameraPaddingEmulation.fromNativeCamera( + holder.map.cameraPosition.toMapCameraPosition(), + cameraPaddings, + GOOGLE_VERTICAL_FOV, + viewportHeightDp(), + ) holder.map.projection.visibleRegion.let { val visibleRegion = VisibleRegion( diff --git a/src/main/java/com/mapconductor/googlemaps/MapCameraPosition.kt b/src/main/java/com/mapconductor/googlemaps/MapCameraPosition.kt index c7b2dc2..e5e2cd6 100644 --- a/src/main/java/com/mapconductor/googlemaps/MapCameraPosition.kt +++ b/src/main/java/com/mapconductor/googlemaps/MapCameraPosition.kt @@ -16,6 +16,13 @@ import kotlin.math.tan private val converter = ZoomAltitudeConverter(AbstractZoomAltitudeConverter.DEFAULT_ZOOM0_ALTITUDE) +/** + * Google Maps(Android)のカメラの縦方向の視野角(度)。SDK に取得 API は無い。 + * 地図の大きさによらず一定で、TB520FU の縦・横・半分の大きさで 30° を実測した + * (焦点距離 ≈ 地図の高さ × 1.86)。web の Google Maps JS(ベクター地図)の約 25° とは違う。 + */ +internal const val GOOGLE_VERTICAL_FOV = 30.0 + fun MapCameraPosition.toCameraPosition(): CameraPosition { if (this.tilt >= 0) { return CameraPosition @@ -58,6 +65,7 @@ fun MapCameraPosition.Companion.from(position: MapCameraPositionInterface): MapC tilt = position.tilt, paddings = position.paddings, visibleRegion = position.visibleRegion, + fov = position.fov, ) } @@ -76,5 +84,6 @@ fun CameraPosition.toMapCameraPosition(paddings: MapPaddingsInterface = MapPaddi tilt = tilt.toDouble(), paddings = paddings, visibleRegion = null, + fov = GOOGLE_VERTICAL_FOV, ) }