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
3 changes: 3 additions & 0 deletions api/android-for-googlemaps.api
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -178,6 +180,7 @@ public final class com.mapconductor.googlemaps.LatLngInterpolationCache {
public final void put(java.lang.String, java.util.List<com.google.android.gms.maps.model.LatLng>);
}
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -75,6 +78,16 @@ class GoogleMapViewController internal constructor(
internal val markerEventControllers = mutableListOf<DefaultMarkerEventController<GoogleMapActualMarker>>()
private val _mapLoadedState = MutableStateFlow(false)
val mapLoadedState: StateFlow<Boolean> = _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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
Expand All @@ -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,
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -58,6 +65,7 @@ fun MapCameraPosition.Companion.from(position: MapCameraPositionInterface): MapC
tilt = position.tilt,
paddings = position.paddings,
visibleRegion = position.visibleRegion,
fov = position.fov,
)
}

Expand All @@ -76,5 +84,6 @@ fun CameraPosition.toMapCameraPosition(paddings: MapPaddingsInterface = MapPaddi
tilt = tilt.toDouble(),
paddings = paddings,
visibleRegion = null,
fov = GOOGLE_VERTICAL_FOV,
)
}
Loading