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
1 change: 1 addition & 0 deletions api/android-for-here.api
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ public final class com.mapconductor.here.marker.HereMarkerController$Companion {
public final class com.mapconductor.here.marker.HereMarkerRenderer extends com.mapconductor.core.marker.AbstractMarkerOverlayRenderer<com.mapconductor.here.HereViewHolder, com.here.sdk.mapview.MapMarker> {
public com.mapconductor.here.marker.HereMarkerRenderer(com.mapconductor.here.HereViewHolder, kotlinx.coroutines.CoroutineScope);
public com.mapconductor.here.marker.HereMarkerRenderer(com.mapconductor.here.HereViewHolder, kotlinx.coroutines.CoroutineScope, int, kotlin.jvm.internal.DefaultConstructorMarker);
protected java.lang.Object applyDrawOrder(java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<com.here.sdk.mapview.MapMarker>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public boolean getSupportsAnimationOverlay();
public void setMarkerVisible(com.mapconductor.core.marker.MarkerEntityInterface<com.here.sdk.mapview.MapMarker>, boolean);
public void setMarkerPosition(com.mapconductor.core.marker.MarkerEntityInterface<com.here.sdk.mapview.MapMarker>, com.mapconductor.core.features.GeoPoint);
Expand Down
41 changes: 35 additions & 6 deletions src/main/java/com/mapconductor/here/marker/HereMarkerRenderer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package com.mapconductor.here.marker

import com.here.sdk.core.Metadata
import com.here.sdk.mapview.MapMarker
import com.mapconductor.core.calculateZIndex
import com.mapconductor.core.features.GeoPoint
import com.mapconductor.core.marker.AbstractMarkerOverlayRenderer
import com.mapconductor.core.marker.MarkerEntityInterface
import com.mapconductor.core.marker.MarkerOverlayRendererInterface
import com.mapconductor.core.marker.MarkerState
import com.mapconductor.here.HereActualMarker
import com.mapconductor.here.HereViewHolder
import com.mapconductor.here.toAnchor2D
Expand All @@ -16,6 +16,7 @@ import java.io.Serializable
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

class HereMarkerRenderer(
holder: HereViewHolder,
Expand All @@ -27,8 +28,32 @@ class HereMarkerRenderer(
holder = holder,
coroutine = coroutine,
) {
private fun resolveDrawOrder(state: com.mapconductor.core.marker.MarkerState): Int =
state.zIndex ?: calculateZIndex(state.position)
// HERE の drawOrder は整数で、しかも小さい値でしか効かない(タブレットの実機で 2849 は
// 効き、4274 以上は無視されて足した順になった)。zIndex と位置を 1 つの値に詰める余地が
// 無いので、全マーカーを [drawOrderOf](zIndex が第 1 キー、同じなら画面で下が手前)で
// 並べた順位を 0..[MAX_DRAW_ORDER] に割り振る。足す・変える・地図が回るたびに振り直す。
private val live = LinkedHashMap<String, Pair<MapMarker, MarkerState>>()

private fun track(
marker: MapMarker,
state: MarkerState,
) = synchronized(live) { live[state.id] = marker to state }

private suspend fun assignDrawOrders() {
val sorted = synchronized(live) { live.values.toList() }.sortedBy { (_, state) -> drawOrderOf(state) }
if (sorted.isEmpty()) return
val last = (sorted.size - 1).coerceAtLeast(1).toLong()
withContext(coroutine.coroutineContext) {
sorted.forEachIndexed { i, (marker, _) ->
// 数が多いと順位を間引く(隣どうしが同じ値になり、その間だけ足した順になる)。
val order = if (sorted.size <= MAX_DRAW_ORDER + 1) i else (i * MAX_DRAW_ORDER / last).toInt()
if (marker.drawOrder != order) marker.drawOrder = order
}
}
}

// 地図が回ったら、今の向きで順位を振り直す。
override suspend fun applyDrawOrder(entities: List<MarkerEntityInterface<HereActualMarker>>) = assignDrawOrders()

override val supportsAnimationOverlay: Boolean = true

Expand Down Expand Up @@ -65,7 +90,6 @@ class HereMarkerRenderer(
params.bitmapIcon.toMapImage(),
params.bitmapIcon.toAnchor2D(),
).apply {
drawOrder = resolveDrawOrder(params.state)
metadata =
Metadata().apply {
// Always include MapConductor marker id
Expand All @@ -74,6 +98,7 @@ class HereMarkerRenderer(
putExtras(params.state.extra)
}
}
track(marker, params.state)
return@map marker
}

Expand All @@ -84,6 +109,7 @@ class HereMarkerRenderer(
}

override suspend fun onRemove(data: List<MarkerEntityInterface<HereActualMarker>>) {
synchronized(live) { data.forEach { live.remove(it.state.id) } }
coroutine.launch {
val markers: List<HereActualMarker> = data.mapNotNull { params -> params.marker }
if (markers.isNotEmpty()) {
Expand All @@ -93,7 +119,7 @@ class HereMarkerRenderer(
}

override suspend fun onPostProcess() {
// Do nothing here
assignDrawOrders()
}

override suspend fun onChange(
Expand All @@ -111,13 +137,16 @@ class HereMarkerRenderer(
}
marker.coordinates =
GeoPoint.from(params.current.state.position).toGeoCoordinates()
marker.drawOrder = resolveDrawOrder(params.current.state)
track(marker, params.current.state)

// Hereはマーカーを再作成しなくてよいので、同じマーカーのインスタンスを返す
marker
}
}

/** マーカーの drawOrder に使う上限。実機で効いた最大(2849)より小さく取る。 */
private const val MAX_DRAW_ORDER = 2047

// Convert MarkerState.extra into HERE Metadata entries.
// Supports Map<String, Any?> by best-effort type mapping; otherwise stores value as string under key "mc:extra".
private fun Metadata.putExtras(extra: Serializable?) {
Expand Down
Loading