diff --git a/api/android-for-openmobilemaps.api b/api/android-for-openmobilemaps.api index 9e76ef6..dcd58fe 100644 --- a/api/android-for-openmobilemaps.api +++ b/api/android-for-openmobilemaps.api @@ -251,6 +251,7 @@ public final class com.mapconductor.openmobilemaps.OpenMobileMapsMarkerOverlayRe public java.lang.Object onChange(java.util.List>, kotlin.coroutines.Continuation>); public java.lang.Object onRemove(java.util.List>, kotlin.coroutines.Continuation); public java.lang.Object onPostProcess(kotlin.coroutines.Continuation); + protected java.lang.Object applyDrawOrder(java.util.List>, 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 final void onVisualTiltChanged(); diff --git a/src/main/java/com/mapconductor/openmobilemaps/OpenMobileMapsOverlays.kt b/src/main/java/com/mapconductor/openmobilemaps/OpenMobileMapsOverlays.kt index 46089e3..3774910 100644 --- a/src/main/java/com/mapconductor/openmobilemaps/OpenMobileMapsOverlays.kt +++ b/src/main/java/com/mapconductor/openmobilemaps/OpenMobileMapsOverlays.kt @@ -20,6 +20,7 @@ import com.mapconductor.core.groundimage.GroundImageState import com.mapconductor.core.map.MapCameraPosition import com.mapconductor.core.marker.AbstractMarkerOverlayRenderer import com.mapconductor.core.marker.BitmapIcon +import com.mapconductor.core.marker.MarkerDrawOrder import com.mapconductor.core.marker.MarkerEntityInterface import com.mapconductor.core.marker.MarkerManager import com.mapconductor.core.marker.MarkerOverlayRendererInterface @@ -194,6 +195,11 @@ class OpenMobileMapsMarkerOverlayRenderer( applyIcons() } + // 地図が回ったら、今の向きで並べ直して流し直す。 + override suspend fun applyDrawOrder(entities: List>) { + applyIcons() + } + override fun onDragSelectionChanged( previous: MarkerEntityInterface?, current: MarkerEntityInterface?, @@ -212,13 +218,17 @@ class OpenMobileMapsMarkerOverlayRenderer( * * `tiling` が立っている entity は [com.mapconductor.core.marker.MarkerTileRenderer] が * ラスタータイルとして描くので、ここでは除く(除かないと同じマーカーが二重に出る)。 + * + * アイコンレイヤはリストの後ろほど上に描くので、[MarkerDrawOrder] の小さい順に並べる + * (zIndex が大きいほど、同じなら画面で下ほど上)。マネージャの順(足した順)に任せない。 */ private fun applyIcons() { val icons = markerManager .allEntities() .asSequence() - .filter { !it.tiling && it.visible } + .filter { !it.tiling && it.visible && it.marker != null } + .sortedBy { drawOrderOf(it.state) } .mapNotNull { it.marker } .toCollection(ArrayList()) iconLayer.setIcons(icons) @@ -419,8 +429,9 @@ class OpenMobileMapsPolylineOverlayRenderer( } @Suppress("USELESS_CAST") - private fun nativePolylineOf(entity: PolylineEntityInterface): OpenMobileMapsActualPolyline? = - entity.polyline as OpenMobileMapsActualPolyline? + private fun nativePolylineOf( + entity: PolylineEntityInterface, + ): OpenMobileMapsActualPolyline? = entity.polyline as OpenMobileMapsActualPolyline? } // ── ポリゴン ────────────────────────────────────────────────────────────── @@ -504,8 +515,9 @@ class OpenMobileMapsPolygonOverlayRenderer( } @Suppress("USELESS_CAST") - private fun nativePolygonOf(entity: PolygonEntityInterface): OpenMobileMapsActualPolygon? = - entity.polygon as OpenMobileMapsActualPolygon? + private fun nativePolygonOf( + entity: PolygonEntityInterface, + ): OpenMobileMapsActualPolygon? = entity.polygon as OpenMobileMapsActualPolygon? } // ── 円 ────────────────────────────────────────────────────────────────────