diff --git a/api/android-for-longdo.api b/api/android-for-longdo.api index 9a4b484..4697ab3 100644 --- a/api/android-for-longdo.api +++ b/api/android-for-longdo.api @@ -351,6 +351,7 @@ public final class com.mapconductor.longdo.marker.LongdoClusterMarkerRenderer im public java.lang.Object onPostProcess(kotlin.coroutines.Continuation); public void onDragSelectionChanged(com.mapconductor.core.marker.MarkerEntityInterface, com.mapconductor.core.marker.MarkerEntityInterface); public void onDragPositionChanged(com.mapconductor.core.features.GeoPointInterface); + public java.lang.Object onDrawOrderFrameChanged(com.mapconductor.core.marker.MarkerDrawOrder$Frame, java.util.List>, kotlin.coroutines.Continuation); } public final class com.mapconductor.longdo.marker.LongdoMarkerTileRenderer { public static final double TILE_SIZE; diff --git a/src/main/java/com/mapconductor/longdo/LongdoMapView.kt b/src/main/java/com/mapconductor/longdo/LongdoMapView.kt index 35ec922..8e26dd4 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoMapView.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoMapView.kt @@ -50,8 +50,10 @@ import com.mapconductor.core.map.MapViewStyle import com.mapconductor.core.map.MapViewStyleEffect import com.mapconductor.core.map.VisibleRegion import com.mapconductor.core.marker.MarkerCapableInterface +import com.mapconductor.core.marker.MarkerDrawOrder import com.mapconductor.core.marker.MarkerRenderingSupportKey import com.mapconductor.core.marker.MarkerState +import com.mapconductor.core.marker.rememberMarkerDrawOrderFrame import com.mapconductor.core.polygon.PolygonCapableInterface import com.mapconductor.core.polyline.PolylineCapableInterface import com.mapconductor.core.raster.RasterLayerCapableInterface @@ -411,8 +413,12 @@ fun LongdoMapSurface( ) } + // 地図が回って止まったら、同じ zIndex の前後を画面の上下で並べ直す。 + val drawOrderFrame = rememberMarkerDrawOrderFrame { currentState.cameraPosition } if (mapReady) { - markers.forEach { markerState -> + // 後に置いたものほど上に描かれる。zIndex が大きいほど、同じなら画面で下ほど上 + // ([MarkerDrawOrder])。足した順には任せない。 + markers.sortedBy { MarkerDrawOrder.of(it.zIndex, it.position, drawOrderFrame) }.forEach { markerState -> key(markerState.id) { LongdoMarkerOverlay( marker = markerState,