diff --git a/api/android-for-maptiler.api b/api/android-for-maptiler.api index cf68f87..78878e3 100644 --- a/api/android-for-maptiler.api +++ b/api/android-for-maptiler.api @@ -315,6 +315,7 @@ public final class com.mapconductor.maptiler.marker.MapTilerClusterMarkerRendere 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.maptiler.marker.MapTilerMarkerTileRenderer { public static final double TILE_SIZE; diff --git a/src/main/java/com/mapconductor/maptiler/MapTilerMapView.kt b/src/main/java/com/mapconductor/maptiler/MapTilerMapView.kt index 41b9924..517a96a 100644 --- a/src/main/java/com/mapconductor/maptiler/MapTilerMapView.kt +++ b/src/main/java/com/mapconductor/maptiler/MapTilerMapView.kt @@ -44,8 +44,10 @@ import com.mapconductor.core.map.VectorStyleAsDesign import com.mapconductor.core.map.VectorStyleMutationSupportKey import com.mapconductor.core.map.VectorStyleSupportKey import com.mapconductor.core.map.applyStyleMutations +import com.mapconductor.core.marker.MarkerDrawOrder import com.mapconductor.core.marker.MarkerRenderingSupportKey import com.mapconductor.core.marker.MarkerTilingOptions +import com.mapconductor.core.marker.rememberMarkerDrawOrderFrame import com.maptiler.maptilersdk.events.MTEvent import com.maptiler.maptilersdk.map.MTMapOptions import com.maptiler.maptilersdk.map.MTMapView @@ -426,8 +428,12 @@ fun MapTilerMapSurface( styleVariant = design.variant, ) + // 地図が回って止まったら、同じ zIndex の前後を画面の上下で並べ直す。 + val drawOrderFrame = rememberMarkerDrawOrderFrame { state.cameraPosition } if (mapReady) { - markers.forEach { markerState -> + // 後に置いたものほど上に描かれる。zIndex が大きいほど、同じなら画面で下ほど上 + // ([MarkerDrawOrder])。足した順には任せない。 + markers.sortedBy { MarkerDrawOrder.of(it.zIndex, it.position, drawOrderFrame) }.forEach { markerState -> key(markerState.id) { MapTilerMarkerOverlay(mtController, markerState) }