From 823af090a3cebfbf6ae1a6794a54649cd65ecbb5 Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Wed, 11 Nov 2026 11:41:05 -0800 Subject: [PATCH 1/2] Hand icons to the layer in MarkerDrawOrder The icon layer draws later entries on top, and the list followed the manager (add order). It is now sorted by zIndex, then south and west. --- .../mapconductor/openmobilemaps/OpenMobileMapsOverlays.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/mapconductor/openmobilemaps/OpenMobileMapsOverlays.kt b/src/main/java/com/mapconductor/openmobilemaps/OpenMobileMapsOverlays.kt index 46089e3..355a491 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 @@ -212,13 +213,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 { MarkerDrawOrder.of(it.state.zIndex, it.state.position) } .mapNotNull { it.marker } .toCollection(ArrayList()) iconLayer.setIcons(icons) From 6317ca64bd1f6ed393e72715ac9fbf975d94efbd Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Wed, 11 Nov 2026 15:00:56 -0800 Subject: [PATCH 2/2] Reorder markers when the map rotates Same-zIndex markers follow the screen position (lower in front) and are re-sorted after rotation settles. --- api/android-for-openmobilemaps.api | 1 + .../openmobilemaps/OpenMobileMapsOverlays.kt | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) 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 355a491..3774910 100644 --- a/src/main/java/com/mapconductor/openmobilemaps/OpenMobileMapsOverlays.kt +++ b/src/main/java/com/mapconductor/openmobilemaps/OpenMobileMapsOverlays.kt @@ -195,6 +195,11 @@ class OpenMobileMapsMarkerOverlayRenderer( applyIcons() } + // 地図が回ったら、今の向きで並べ直して流し直す。 + override suspend fun applyDrawOrder(entities: List>) { + applyIcons() + } + override fun onDragSelectionChanged( previous: MarkerEntityInterface?, current: MarkerEntityInterface?, @@ -215,7 +220,7 @@ class OpenMobileMapsMarkerOverlayRenderer( * ラスタータイルとして描くので、ここでは除く(除かないと同じマーカーが二重に出る)。 * * アイコンレイヤはリストの後ろほど上に描くので、[MarkerDrawOrder] の小さい順に並べる - * (zIndex が大きいほど、同じなら南・西ほど上)。マネージャの順(足した順)に任せない。 + * (zIndex が大きいほど、同じなら画面で下ほど上)。マネージャの順(足した順)に任せない。 */ private fun applyIcons() { val icons = @@ -223,7 +228,7 @@ class OpenMobileMapsMarkerOverlayRenderer( .allEntities() .asSequence() .filter { !it.tiling && it.visible && it.marker != null } - .sortedBy { MarkerDrawOrder.of(it.state.zIndex, it.state.position) } + .sortedBy { drawOrderOf(it.state) } .mapNotNull { it.marker } .toCollection(ArrayList()) iconLayer.setIcons(icons) @@ -424,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? } // ── ポリゴン ────────────────────────────────────────────────────────────── @@ -509,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? } // ── 円 ────────────────────────────────────────────────────────────────────