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-openmobilemaps.api
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,9 @@ public final class com.mapconductor.openmobilemaps.OpenMobileMapsTiltEmulation {
public final kotlin.Pair<com.mapconductor.core.features.GeoPointInterface, java.lang.Double> shiftedCamera(com.mapconductor.core.map.MapCameraPosition);
public final kotlin.Pair<com.mapconductor.core.features.GeoPointInterface, java.lang.Double> restoreLogicalCamera(com.mapconductor.core.features.GeoPointInterface, double, double, double);
}
public final class com.mapconductor.openmobilemaps.OpenMobileMapsTiltEmulationKt {
public static final double OPEN_MOBILE_MAPS_VERTICAL_FOV;
}
public final class com.mapconductor.openmobilemaps.OpenMobileMapsTouchListener extends io.openmobilemaps.mapscore.map.util.SimpleTouchInterface {
public com.mapconductor.openmobilemaps.OpenMobileMapsTouchListener(com.mapconductor.openmobilemaps.OpenMobileMapsMapViewController);
public boolean onTouchDown(io.openmobilemaps.mapscore.shared.graphics.common.Vec2F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ import com.mapconductor.core.features.GeoPoint
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.map.MapCapabilityStatus
import com.mapconductor.core.map.MapPaddings
import com.mapconductor.core.map.MapPaddingsInterface
import com.mapconductor.core.map.MapUISettings
import com.mapconductor.core.map.MutableMapServiceRegistry
import com.mapconductor.core.map.VisibleRegion
Expand Down Expand Up @@ -106,6 +109,15 @@ class OpenMobileMapsMapViewController(
*/
private var logicalTilt: Double = 0.0

/**
* 今カメラに付いているパディング(dp)。
*
* SDK の `setPaddingLeft` などは使わない。付けた瞬間に画面がずれ、こちらで刻んでいる
* アニメーションにも載らないため。代わりにカメラ中心をずらして再現し
* ([CameraPaddingEmulation])、読むときに元へ戻すためにここで覚えておく。
*/
private var cameraPaddings: MapPaddingsInterface = MapPaddings.Zeros

/** 直近に適用した tilt。アイコンの引き伸ばしを毎フレーム付け直さないための番人。 */
private var lastAppliedTilt: Double = 0.0

Expand Down Expand Up @@ -296,13 +308,25 @@ class OpenMobileMapsMapViewController(
val (center, zoom) =
OpenMobileMapsTiltEmulation.restoreLogicalCamera(rawCenter, rawZoom, bearing, logicalTilt)

return MapCameraPosition(position = center, zoom = zoom, bearing = bearing, tilt = logicalTilt)
return CameraPaddingEmulation.fromNativeCamera(
MapCameraPosition(position = center, zoom = zoom, bearing = bearing, tilt = logicalTilt),
cameraPaddings,
OPEN_MOBILE_MAPS_VERTICAL_FOV,
viewportHeightDp(),
)
}

/** 地図の高さ(dp)。 */
private fun viewportHeightDp(): Double {
val density = holder.mapView.resources.displayMetrics.density
return holder.mapView.height / density.toDouble()
}

private fun visibleRegion(): VisibleRegion? = holder.buildVisibleRegion()

override fun moveCamera(position: MapCameraPosition) {
cancelCameraAnimation()
position.paddings?.let { cameraPaddings = it }
applyCamera(position)
}

Expand All @@ -325,10 +349,14 @@ class OpenMobileMapsMapViewController(
) {
cancelCameraAnimation()
if (duration <= 0L) {
position.paddings?.let { cameraPaddings = it }
applyCamera(position)
return
}

// 先に新しいパディングへ切り替えてから始点を読む。始点も新しいパディングで
// 表した位置になるので、最初のフレームで画面が跳ばない。
position.paddings?.let { cameraPaddings = it }
val from = readLogicalCamera()
cameraAnimationJob =
mainCoroutine.launch {
Expand Down Expand Up @@ -382,7 +410,13 @@ class OpenMobileMapsMapViewController(
.forEach { it.onVisualTiltChanged() }
}

val (center, zoom) = OpenMobileMapsTiltEmulation.shiftedCamera(position)
val native =
CameraPaddingEmulation.toNativeCamera(
position.copy(paddings = cameraPaddings),
OPEN_MOBILE_MAPS_VERTICAL_FOV,
viewportHeightDp(),
)
val (center, zoom) = OpenMobileMapsTiltEmulation.shiftedCamera(native)
val camera = holder.map.getCamera()
camera.moveToCenterPositionZoom(center.toOmmCoord(), ZOOM_CONVERTER.toNativeZoom(zoom), false)
// 方位が変わっていないなら触らない。毎フレーム呼ぶと SDK 側で無駄な
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ import kotlin.math.abs
import kotlin.math.cos
import kotlin.math.tan

/**
* OpenMobileMaps のカメラの縦方向の視野角(度)。SDK のカメラは 2D なので、傾きは
* ビューを X 軸まわりに回して見せている([OpenMobileMapsMapSurface])。その遠近は
* ほとんど付かず、TB520FU で傾けたときの縦の間隔は cos(tilt) 倍と 0.3% 以内で
* 一致した。遠近なしの傾きとして 0 と表す。
*/
internal const val OPEN_MOBILE_MAPS_VERTICAL_FOV = 0.0

/**
* Open Mobile Maps の 2D カメラ向けの tilt 擬似表現。
*
Expand Down
Loading