From 6ca917b1afa0e63f16c8d5fca4ed513262d6f15c Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Wed, 11 Nov 2026 11:41:05 -0800 Subject: [PATCH 1/2] Draw marker overlays in MarkerDrawOrder Compose draws later children on top and the overlays followed the published list (add order). They are now sorted by zIndex, then south and west. --- src/main/java/com/mapconductor/longdo/LongdoMapView.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/mapconductor/longdo/LongdoMapView.kt b/src/main/java/com/mapconductor/longdo/LongdoMapView.kt index 35ec922..ce34402 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoMapView.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoMapView.kt @@ -50,6 +50,7 @@ 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.polygon.PolygonCapableInterface @@ -412,7 +413,9 @@ fun LongdoMapSurface( } if (mapReady) { - markers.forEach { markerState -> + // 後に置いたものほど上に描かれる。zIndex が大きいほど、同じなら南・西ほど上 + // ([MarkerDrawOrder])。足した順には任せない。 + markers.sortedBy { MarkerDrawOrder.of(it.zIndex, it.position) }.forEach { markerState -> key(markerState.id) { LongdoMarkerOverlay( marker = markerState, From b11229f8c9be8148bb284452065332da72dba8ff Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Wed, 11 Nov 2026 15:00:56 -0800 Subject: [PATCH 2/2] Reorder marker overlays when the map rotates Same-zIndex overlays follow the screen position (lower in front), using rememberMarkerDrawOrderFrame so they are re-sorted once rotation settles. --- api/android-for-longdo.api | 1 + src/main/java/com/mapconductor/longdo/LongdoMapView.kt | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 ce34402..8e26dd4 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoMapView.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoMapView.kt @@ -53,6 +53,7 @@ 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 @@ -412,10 +413,12 @@ fun LongdoMapSurface( ) } + // 地図が回って止まったら、同じ zIndex の前後を画面の上下で並べ直す。 + val drawOrderFrame = rememberMarkerDrawOrderFrame { currentState.cameraPosition } if (mapReady) { - // 後に置いたものほど上に描かれる。zIndex が大きいほど、同じなら南・西ほど上 + // 後に置いたものほど上に描かれる。zIndex が大きいほど、同じなら画面で下ほど上 // ([MarkerDrawOrder])。足した順には任せない。 - markers.sortedBy { MarkerDrawOrder.of(it.zIndex, it.position) }.forEach { markerState -> + markers.sortedBy { MarkerDrawOrder.of(it.zIndex, it.position, drawOrderFrame) }.forEach { markerState -> key(markerState.id) { LongdoMarkerOverlay( marker = markerState,