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
28 changes: 26 additions & 2 deletions api/android-sdk-core.api
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,7 @@ final class com.mapconductor.core.marker.AbstractDefaultIcon$PinBounds {
public final float getTop();
public final float getBottom();
}
public abstract class com.mapconductor.core.marker.AbstractMarkerController<ActualMarker> implements com.mapconductor.core.controller.SlottedOverlayController<com.mapconductor.core.marker.MarkerState, com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>>, com.mapconductor.core.marker.MarkerEventHostInterface<ActualMarker> {
public abstract class com.mapconductor.core.marker.AbstractMarkerController<ActualMarker> implements com.mapconductor.core.controller.SlottedOverlayController<com.mapconductor.core.marker.MarkerState, com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>>, com.mapconductor.core.marker.MarkerEventHostInterface<ActualMarker>, com.mapconductor.core.marker.MarkerDrawOrderReceiver {
public com.mapconductor.core.marker.AbstractMarkerController(com.mapconductor.core.marker.MarkerManager<ActualMarker>, com.mapconductor.core.marker.MarkerOverlayRendererInterface<ActualMarker>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.marker.MarkerState, kotlin.Unit>);
public com.mapconductor.core.marker.AbstractMarkerController(com.mapconductor.core.marker.MarkerManager, com.mapconductor.core.marker.MarkerOverlayRendererInterface, kotlin.jvm.functions.Function1, int, kotlin.jvm.internal.DefaultConstructorMarker);
public com.mapconductor.core.marker.MarkerManager<ActualMarker> getMarkerManager();
Expand Down Expand Up @@ -1616,6 +1616,7 @@ public abstract class com.mapconductor.core.marker.AbstractMarkerController<Actu
public com.mapconductor.core.controller.OverlayHit resolveTap(com.mapconductor.core.features.GeoPointInterface);
public com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker> getEntity(java.lang.String);
public boolean has(java.lang.String);
public java.lang.Object onDrawOrderFrameChanged(com.mapconductor.core.marker.MarkerDrawOrder$Frame, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public void setClickListenerAny(java.lang.Object);
public java.lang.Object update(java.lang.Object, kotlin.coroutines.Continuation);
public java.lang.Object find(com.mapconductor.core.features.GeoPointInterface);
Expand Down Expand Up @@ -1645,6 +1646,11 @@ public abstract class com.mapconductor.core.marker.AbstractMarkerOverlayRenderer
public final com.mapconductor.core.marker.MarkerAnimationOverlayHost getAnimationOverlayHost();
public final void setAnimationOverlayHost(com.mapconductor.core.marker.MarkerAnimationOverlayHost);
public boolean getSupportsAnimationOverlay();
public final com.mapconductor.core.marker.MarkerDrawOrder$Frame getDrawOrderFrame();
public final double drawOrderOf(com.mapconductor.core.marker.MarkerState);
public final int drawOrderIntOf(com.mapconductor.core.marker.MarkerState);
public java.lang.Object onDrawOrderFrameChanged(com.mapconductor.core.marker.MarkerDrawOrder$Frame, java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
protected java.lang.Object applyDrawOrder(java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public void setMarkerVisible(com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>, boolean);
public abstract void setMarkerPosition(com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>, com.mapconductor.core.features.GeoPoint);
public java.lang.Object onAnimate(com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
Expand Down Expand Up @@ -1805,6 +1811,21 @@ public final class com.mapconductor.core.marker.MarkerCollector implements com.m
public java.lang.Object add(com.mapconductor.core.ComponentState, kotlin.coroutines.Continuation);
public com.mapconductor.core.marker.MarkerCollector(long, kotlinx.coroutines.CoroutineScope, kotlin.jvm.internal.DefaultConstructorMarker);
}
public final class com.mapconductor.core.marker.MarkerDrawOrder$Frame {
public static final com.mapconductor.core.marker.MarkerDrawOrder$Frame$Companion Companion;
public final double getHeadingDegrees();
public final double getOriginLongitude();
public final boolean differsEnoughFrom(com.mapconductor.core.marker.MarkerDrawOrder$Frame);
public final double component1();
public final double component2();
public final com.mapconductor.core.marker.MarkerDrawOrder$Frame copy(double, double);
public java.lang.String toString();
public int hashCode();
public boolean equals(java.lang.Object);
}
public final class com.mapconductor.core.marker.MarkerDrawOrder$Frame$Companion {
public final com.mapconductor.core.marker.MarkerDrawOrder$Frame getNorthUp();
}
public final class com.mapconductor.core.marker.MarkerEntity<ActualMarker> implements com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker> {
public com.mapconductor.core.marker.MarkerEntity(ActualMarker, com.mapconductor.core.marker.MarkerState, boolean, boolean, boolean);
public com.mapconductor.core.marker.MarkerEntity(java.lang.Object, com.mapconductor.core.marker.MarkerState, boolean, boolean, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker);
Expand Down Expand Up @@ -1942,6 +1963,7 @@ public interface com.mapconductor.core.marker.MarkerOverlayRendererInterface<Act
public abstract java.lang.Object onPostProcess(kotlin.coroutines.Continuation<? super kotlin.Unit>);
public default void onDragSelectionChanged(com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>, com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>);
public default void onDragPositionChanged(com.mapconductor.core.features.GeoPointInterface);
public default java.lang.Object onDrawOrderFrameChanged(com.mapconductor.core.marker.MarkerDrawOrder$Frame, java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
}
public interface com.mapconductor.core.marker.MarkerOverlayRendererInterface$AddParamsInterface {
public abstract com.mapconductor.core.marker.MarkerState getState();
Expand All @@ -1955,6 +1977,7 @@ public interface com.mapconductor.core.marker.MarkerOverlayRendererInterface$Cha
public final class com.mapconductor.core.marker.MarkerOverlayRendererInterface$DefaultImpls {
public static <ActualMarker> void onDragSelectionChanged(com.mapconductor.core.marker.MarkerOverlayRendererInterface<ActualMarker>, com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>, com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>);
public static <ActualMarker> void onDragPositionChanged(com.mapconductor.core.marker.MarkerOverlayRendererInterface<ActualMarker>, com.mapconductor.core.features.GeoPointInterface);
public static <ActualMarker> java.lang.Object onDrawOrderFrameChanged(com.mapconductor.core.marker.MarkerOverlayRendererInterface<ActualMarker>, com.mapconductor.core.marker.MarkerDrawOrder$Frame, java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
}
public interface com.mapconductor.core.marker.MarkerRenderingStrategyInterface<ActualMarker> {
public abstract com.mapconductor.core.marker.MarkerManager<ActualMarker> getMarkerManager();
Expand Down Expand Up @@ -2147,7 +2170,7 @@ public final class com.mapconductor.core.marker.PointD {
public int hashCode();
public boolean equals(java.lang.Object);
}
public final class com.mapconductor.core.marker.StrategyMarkerController<ActualMarker> implements com.mapconductor.core.controller.SlottedOverlayController<com.mapconductor.core.marker.MarkerState, com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>>, com.mapconductor.core.controller.OnCameraChangeReceiverInterface, com.mapconductor.core.marker.MarkerEventHostInterface<ActualMarker> {
public final class com.mapconductor.core.marker.StrategyMarkerController<ActualMarker> implements com.mapconductor.core.controller.SlottedOverlayController<com.mapconductor.core.marker.MarkerState, com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker>>, com.mapconductor.core.controller.OnCameraChangeReceiverInterface, com.mapconductor.core.marker.MarkerEventHostInterface<ActualMarker>, com.mapconductor.core.marker.MarkerDrawOrderReceiver {
public com.mapconductor.core.marker.StrategyMarkerController(com.mapconductor.core.marker.MarkerRenderingStrategyInterface<ActualMarker>, com.mapconductor.core.marker.MarkerOverlayRendererInterface<ActualMarker>);
public com.mapconductor.core.marker.MarkerOverlayRendererInterface<ActualMarker> getRenderer();
public com.mapconductor.core.marker.MarkerManager<ActualMarker> getMarkerManager();
Expand Down Expand Up @@ -2176,6 +2199,7 @@ public final class com.mapconductor.core.marker.StrategyMarkerController<ActualM
public com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker> getEntity(java.lang.String);
public com.mapconductor.core.marker.MarkerEntityInterface<ActualMarker> find(com.mapconductor.core.features.GeoPointInterface);
public java.lang.Object onCameraChanged(com.mapconductor.core.map.MapCameraPosition, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public java.lang.Object onDrawOrderFrameChanged(com.mapconductor.core.marker.MarkerDrawOrder$Frame, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public void destroy();
public com.mapconductor.core.controller.OverlayKind getKind();
public com.mapconductor.core.controller.OverlayHit resolveTap(com.mapconductor.core.features.GeoPointInterface);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package com.mapconductor.core.marker

import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import android.util.Log

/**
* アンカーがピンの先端に乗っているか。`scale` で縮めても `iconSize` で縮めても同じ。
*
* 先端は、アンカー列で一番下にある不透明な画素。アンカーの y との差を px で測る。
*/
@RunWith(AndroidJUnit4::class)
class DefaultIconAnchorDeviceTest {
private fun tipGapPx(icon: ColorDefaultIcon): Float {
val bitmapIcon = icon.toBitmapIcon()
val bitmap = bitmapIcon.bitmap
val anchorX = (bitmapIcon.anchor.x * bitmap.width).toInt().coerceIn(0, bitmap.width - 1)
val anchorY = bitmapIcon.anchor.y * bitmap.height
var lowest = -1
for (y in 0 until bitmap.height) {
for (dx in -1..1) {
val x = (anchorX + dx).coerceIn(0, bitmap.width - 1)
if ((bitmap.getPixel(x, y) ushr 24) > 128) lowest = y
}
}
val gap = anchorY - (lowest + 1)
Log.i(
"IconAnchor",
"${bitmap.width}x${bitmap.height} anchor=${bitmapIcon.anchor} tipBottom=${lowest + 1} gap=$gap",
)
return gap
}

@Test
fun anchorSitsOnTheTipWhateverTheSize() {
val icons =
listOf(
ColorDefaultIcon(fillColor = Color.Red),
ColorDefaultIcon(fillColor = Color.Red, label = "T"),
ColorDefaultIcon(fillColor = Color.Blue, label = "P", scale = 0.6f),
ColorDefaultIcon(fillColor = Color.Blue, label = "P", iconSize = 28.dp),
ColorDefaultIcon(fillColor = Color.Blue, scale = 0.6f),
ColorDefaultIcon(fillColor = Color.Blue, scale = 2f),
)
val gaps = icons.map { tipGapPx(it) / it.toBitmapIcon().bitmap.height }
// 素のピン(1 番目)の先端とアンカーの差を基準に、どの大きさでも同じ割合であること。
for (gap in gaps) {
assertTrue("gaps $gaps", kotlin.math.abs(gap - gaps[0]) <= 0.02f)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import com.mapconductor.core.map.MapDiagnostics
import com.mapconductor.core.map.MapViewHolderInterface
import com.mapconductor.core.marker.MarkerAnimationOverlayHost
import com.mapconductor.core.marker.MarkerCapableInterface
import com.mapconductor.core.marker.MarkerDrawOrder
import com.mapconductor.core.marker.MarkerDrawOrderReceiver
import com.mapconductor.core.marker.MarkerDrawOrderTracker
import com.mapconductor.core.marker.MarkerState
import com.mapconductor.core.marker.OnMarkerEventHandler
import com.mapconductor.core.marker.StrategyMarkerController
Expand Down Expand Up @@ -54,6 +57,16 @@ abstract class BaseMapViewController :
private var lastNotifiedCameraPosition: MapCameraPosition? = null
abstract val mainCoroutine: CoroutineScope
private val overlayControllers = CopyOnWriteArrayList<OverlayControllerInterface<*, *>>()

/**
* 同じ zIndex のマーカーを地図の向きに合わせて並べ直させる(画面で下ほど手前)。
* 回転が止まってから、登録されたマーカーのコントローラ全部へ一度だけ配る。
*/
private val markerDrawOrder by lazy {
MarkerDrawOrderTracker(defaultCoroutine) { frame ->
overlayControllers.forEach { (it as? MarkerDrawOrderReceiver)?.onDrawOrderFrameChanged(frame) }
}
}
protected var cameraMoveStartCallback: OnCameraMoveHandler? = null
protected var cameraMoveCallback: OnCameraMoveHandler? = null
protected var cameraMoveEndCallback: OnCameraMoveHandler? = null
Expand Down Expand Up @@ -153,6 +166,11 @@ abstract class BaseMapViewController :
override fun registerOverlayController(controller: OverlayControllerInterface<*, *>) {
if (overlayControllers.contains(controller)) return
overlayControllers.add(controller)
// 地図が回った後に登録されたら、今の向きで並べ直させる。
val frame = markerDrawOrder.frame
if (controller is MarkerDrawOrderReceiver && frame != MarkerDrawOrder.Frame.NorthUp) {
defaultCoroutine.launch { controller.onDrawOrderFrameChanged(frame) }
}
// 登録が初期カメラ確定より後になることがある(RN の拡張レンダラや遅延マウントの
// クラスタリングなど)。ユーザー操作までカメライベントを出さないプロバイダ
// (HERE)では次のイベントが永遠に来ず、「登録したのに一度も計算されない」型の
Expand Down Expand Up @@ -536,6 +554,7 @@ abstract class BaseMapViewController :

protected suspend fun notifyMapCameraPosition(mapCameraPosition: MapCameraPosition) {
lastNotifiedCameraPosition = mapCameraPosition
markerDrawOrder.onCameraChanged(mapCameraPosition)
overlayControllers.forEach {
if (it is OnCameraChangeReceiverInterface) {
it.onCameraChanged(mapCameraPosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ abstract class AbstractMarkerController<ActualMarker>(
MarkerState,
MarkerEntityInterface<ActualMarker>,
>,
MarkerEventHostInterface<ActualMarker> {
MarkerEventHostInterface<ActualMarker>,
MarkerDrawOrderReceiver {
override val zIndex: Int = 10
val semaphore = Semaphore(1)

Expand Down Expand Up @@ -376,6 +377,10 @@ abstract class AbstractMarkerController<ActualMarker>(
override fun getEntity(id: String): MarkerEntityInterface<ActualMarker>? = markerManager.getEntity(id)

override fun has(id: String): Boolean = markerManager.hasEntity(id)

override suspend fun onDrawOrderFrameChanged(frame: MarkerDrawOrder.Frame) {
semaphore.withPermit { renderer.onDrawOrderFrameChanged(frame, markerManager.allEntities()) }
}
}

private const val MARKER_RENDER_BATCH_SIZE = 500
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,30 @@ abstract class AbstractMarkerOverlayRenderer<
*/
open val supportsAnimationOverlay: Boolean = false

/** 同じ zIndex のマーカーを並べる向き([onDrawOrderFrameChanged] で変わる)。 */
var drawOrderFrame: MarkerDrawOrder.Frame = MarkerDrawOrder.Frame.NorthUp
private set

/** [drawOrderFrame] で並べたときの描く順。大きいほど手前。 */
fun drawOrderOf(state: MarkerState): Double = MarkerDrawOrder.of(state.zIndex, state.position, drawOrderFrame)

/** [drawOrderOf] の整数版。 */
fun drawOrderIntOf(state: MarkerState): Int = MarkerDrawOrder.ofInt(state.zIndex, state.position, drawOrderFrame)

override suspend fun onDrawOrderFrameChanged(
frame: MarkerDrawOrder.Frame,
entities: List<MarkerEntityInterface<ActualMarker>>,
) {
drawOrderFrame = frame
applyDrawOrder(entities)
}

/**
* [drawOrderFrame] が変わったので、[entities] の描く順を付け直す。
* 既定は何もしない(北が上の順のまま)。
*/
protected open suspend fun applyDrawOrder(entities: List<MarkerEntityInterface<ActualMarker>>) = Unit

/** Hide/show the native marker while the overlay animation runs. */
open fun setMarkerVisible(
markerEntity: MarkerEntityInterface<ActualMarker>,
Expand Down
Loading
Loading