From 4e81b1cd0539e5d0ee25e256cc208581c10c063e Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Sat, 7 Nov 2026 23:35:43 -0800 Subject: [PATCH] Stack overlays in one band order, whatever order they arrive in - Polygons, circles, polylines and markers set drawOrder to their raw zIndex (all 0 by default), so add order decided. They now use OverlayStacking.globalZIndex with 100-wide bands (polygons < circles < polylines < markers, zIndex clamped to +-49 within a band); with 4096-wide bands the device still drew a circle under a polygon. - Polylines added to the default scene were drawn under polygons and circles - and under raster MapLayers - whatever their drawOrder. They now go into a named polyline layer with renderedLast() priority (addMapPolylineLayer / addMapPolyline(_:layerName:)), falling back to the default scene if that layer cannot be added. Seen on device to survive a design change. - Raster, ground image and marker tile MapLayers had no priority: a layer created after the first map item covered all items, so a re-sent raster covered the polygons. HereOverlayStacking creates an empty anchor MapLayer before any item exists and chains rasters and ground images after it in band order (raster < ground image, zIndex within rasters) with renderedAfterLayer(named:). renderedFirst() was tried and sinks them under the basemap. Marker tiles keep the default priority (on top when created = the marker band). Requires ios-sdk-core fix/overlay-stacking-order (OverlayStacking). --- Sources/MapConductorForHERE/HereMapHost.swift | 2 + .../HereOverlayStacking.swift | 133 ++++++++++++++++++ .../circle/HereCircleOverlayRenderer.swift | 6 +- .../HereGroundImageOverlayRenderer.swift | 4 +- .../marker/HereMarkerController.swift | 7 + .../marker/HereMarkerRenderer.swift | 6 +- .../polygon/HerePolygonOverlayRenderer.swift | 10 +- .../HerePolylineOverlayRenderer.swift | 10 +- .../HereRasterLayerOverlayRenderer.swift | 9 +- 9 files changed, 169 insertions(+), 18 deletions(-) create mode 100644 Sources/MapConductorForHERE/HereOverlayStacking.swift diff --git a/Sources/MapConductorForHERE/HereMapHost.swift b/Sources/MapConductorForHERE/HereMapHost.swift index a790edd..e6d4b48 100644 --- a/Sources/MapConductorForHERE/HereMapHost.swift +++ b/Sources/MapConductorForHERE/HereMapHost.swift @@ -280,6 +280,8 @@ public final class HereMapHost: MapViewCoordinatorBase, Marker ) self.mapView = mapView + // ラスター・グラウンドイメージをマップアイテムより下に置くための錨。アイテムより先に作る。 + HereOverlayStacking.installAnchor(on: mapView) bind(state: state, mapView: mapView) // android-for-here の HereMapView.kt と同じ位置で適用する。 applyCameraRestriction(cameraRestriction) diff --git a/Sources/MapConductorForHERE/HereOverlayStacking.swift b/Sources/MapConductorForHERE/HereOverlayStacking.swift new file mode 100644 index 0000000..77266ce --- /dev/null +++ b/Sources/MapConductorForHERE/HereOverlayStacking.swift @@ -0,0 +1,133 @@ +import Foundation +import heresdk +@_spi(MapConductorDriver) import MapConductorCore + +/// HERE の地図レイヤ(`MapLayer`)で載せるオーバーレイ(ラスター・グラウンドイメージ・ +/// マーカーのタイル)を、重なり順の帯(``OverlayBand``)の順に並べる。 +/// +/// `MapLayer` は優先度を指定しないと作った時点で一番上に置かれる。マップアイテム +/// (ポリゴン・サークル・ポリライン・マーカー)が描かれる層は最初のアイテムを足したときに +/// 作られるようで、それより後に作った地図レイヤはアイテムを覆う(実機: 先に足したラスターは +/// ポリゴンの下、送り直したラスターはポリゴンの上)。`renderedFirst()` はベースマップの下まで +/// 沈んで見えなくなる。 +/// +/// そこで、アイテムより先(地図を作った直後)に空の「錨」の地図レイヤを 1 枚作っておき、 +/// ラスター・グラウンドイメージを帯 → zIndex → 作った順に並べて、先頭を錨の直後、 +/// 2 枚目以降を 1 つ前の直後(`renderedAfterLayer(named:)`)に置き直す。 +/// マーカーのタイルは並びに入れず既定の優先度のまま(作った時点で一番上 = マーカーの帯)。 +/// +/// ポリゴン・サークル・ポリライン・マーカー(マップアイテム)の間の順は `drawOrder` +/// (``OverlayStacking/globalZIndex(_:)``)で決める。 +@MainActor +enum HereOverlayStacking { + static let anchorLayerName = "mapconductor-stack-anchor" + + /// `drawOrder` の帯の幅。4096 幅(他プロバイダの既定)では実機で帯の順にならなかったので + /// 小さく取る(帯の中の zIndex は ±49 に丸める)。 + static let drawOrderBandStride = 100 + + /// 錨の地図レイヤを作る。マップアイテムを足す前(`bind` の直後)に呼ぶ。 + static func installAnchor(on mapView: MapView) { + let registry = registry(of: mapView) + guard registry.anchor == nil else { return } + guard let urlProvider = TileUrlProviderFactory.fromXyzUrlTemplate("http://127.0.0.1:1/{z}/{x}/{y}.png") else { return } + let provider = RasterDataSourceConfiguration.Provider( + urlProvider: urlProvider, + tilingScheme: .quadTreeMercator, + storageLevels: [], + hasAlphaChannel: true + ) + let sourceName = "mapconductor-stack-anchor-source" + let cachePath = (NSTemporaryDirectory() as NSString).appendingPathComponent("mapconductor-stack-anchor") + let config = RasterDataSourceConfiguration( + name: sourceName, + provider: provider, + cache: RasterDataSourceConfiguration.Cache(path: cachePath) + ) + registry.anchorSource = RasterDataSource(context: mapView.mapContext, configuration: config) + registry.anchor = try? MapLayerBuilder() + .withName(anchorLayerName) + .withDataSource(named: sourceName, contentType: .rasterImage) + .forMap(mapView.hereMap) + .build() + registry.anchor?.setEnabled(false) + } + + private final class Entry { + let name: String + weak var layer: MapLayer? + let key: OverlayStackKey + init(name: String, layer: MapLayer, key: OverlayStackKey) { + self.name = name + self.layer = layer + self.key = key + } + } + + private final class Registry { + var entries: [Entry] = [] + var anchor: MapLayer? + var anchorSource: RasterDataSource? + var polylineLayerAdded = false + } + + private static var registryKey: UInt8 = 0 + + private static func registry(of mapView: MapView) -> Registry { + if let registry = objc_getAssociatedObject(mapView, ®istryKey) as? Registry { return registry } + let registry = Registry() + objc_setAssociatedObject(mapView, ®istryKey, registry, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) + return registry + } + + static let polylineLayerName = "mapconductor-polylines" + + /// ポリラインを専用のポリラインレイヤ(一番上に描く優先度)へ足す。 + /// + /// 既定のシーンに足したポリラインは `drawOrder` に関わらずポリゴン・サークルの下、 + /// さらにラスターの地図レイヤの下に描かれた(実機)。HERE はポリラインだけ名前付きの + /// レイヤ(`addMapPolylineLayer(name:layerPriority:)`)へ足せるので、そこへ入れて + /// ポリゴン・サークルより上に置く。マーカーは SDK がさらに上に描く。 + static func addPolyline(_ polyline: MapPolyline, to mapView: MapView) { + let registry = registry(of: mapView) + if !registry.polylineLayerAdded { + registry.polylineLayerAdded = mapView.mapScene.addMapPolylineLayer( + name: polylineLayerName, + layerPriority: MapLayerPriorityBuilder().renderedLast().build() + ) + } + if !registry.polylineLayerAdded || !mapView.mapScene.addMapPolyline(polyline, layerName: polylineLayerName) { + mapView.mapScene.addMapPolyline(polyline) + } + } + + /// 作った地図レイヤを帯の位置へ置く。`MapLayerBuilder.build()` の直後に呼ぶ。 + static func place(_ layer: MapLayer, named name: String, _ key: OverlayStackKey, on mapView: MapView) { + // マーカーのタイルは既定の優先度のまま(作った時点で一番上)。 + guard key.band != .marker else { return } + let registry = registry(of: mapView) + registry.entries.removeAll { $0.layer == nil || $0.name == name } + let index = OverlayStacking.insertionIndex(for: key, among: registry.entries.map(\.key)) + registry.entries.insert(Entry(name: name, layer: layer, key: key), at: index) + apply(registry) + } + + /// 外した地図レイヤを並びから除く。 + static func remove(named name: String, on mapView: MapView?) { + guard let mapView else { return } + let registry = registry(of: mapView) + registry.entries.removeAll { $0.layer == nil || $0.name == name } + apply(registry) + } + + private static func apply(_ registry: Registry) { + var previous: String? + for entry in registry.entries { + guard let layer = entry.layer else { continue } + let after = previous ?? (registry.anchor != nil ? anchorLayerName : nil) + guard let after else { break } + layer.setPriority(MapLayerPriorityBuilder().renderedAfterLayer(named: after).build()) + previous = entry.name + } + } +} diff --git a/Sources/MapConductorForHERE/circle/HereCircleOverlayRenderer.swift b/Sources/MapConductorForHERE/circle/HereCircleOverlayRenderer.swift index d21c699..d15ea6b 100644 --- a/Sources/MapConductorForHERE/circle/HereCircleOverlayRenderer.swift +++ b/Sources/MapConductorForHERE/circle/HereCircleOverlayRenderer.swift @@ -1,5 +1,5 @@ import heresdk -import MapConductorCore +@_spi(MapConductorDriver) import MapConductorCore import UIKit @MainActor @@ -19,7 +19,7 @@ final class HereCircleOverlayRenderer: AbstractCircleOverlayRenderer outlineColor: state.strokeColor, outlineWidthInPixels: state.strokeWidth ) - polygon.drawOrder = Int32(state.zIndex ?? 0) + polygon.drawOrder = OverlayStacking.globalZIndex(OverlayStackKey(.circle, zIndex: state.zIndex ?? 0), bandStride: HereOverlayStacking.drawOrderBandStride) mapView.mapScene.addMapPolygon(polygon) return polygon } @@ -47,7 +47,7 @@ final class HereCircleOverlayRenderer: AbstractCircleOverlayRenderer circle.outlineWidth = current.state.strokeWidth } if finger.zIndex != prevFinger.zIndex { - circle.drawOrder = Int32(current.state.zIndex ?? 0) + circle.drawOrder = OverlayStacking.globalZIndex(OverlayStackKey(.circle, zIndex: current.state.zIndex ?? 0), bandStride: HereOverlayStacking.drawOrderBandStride) } return circle diff --git a/Sources/MapConductorForHERE/groundimage/HereGroundImageOverlayRenderer.swift b/Sources/MapConductorForHERE/groundimage/HereGroundImageOverlayRenderer.swift index e0e577e..e52ab1c 100644 --- a/Sources/MapConductorForHERE/groundimage/HereGroundImageOverlayRenderer.swift +++ b/Sources/MapConductorForHERE/groundimage/HereGroundImageOverlayRenderer.swift @@ -1,6 +1,6 @@ import Foundation import heresdk -import MapConductorCore +@_spi(MapConductorDriver) import MapConductorCore @MainActor final class HereGroundImageOverlayRenderer: AbstractGroundImageOverlayRenderer { @@ -131,6 +131,7 @@ final class HereGroundImageOverlayRenderer: AbstractGroundImageOverlayRenderer String { diff --git a/Sources/MapConductorForHERE/marker/HereMarkerController.swift b/Sources/MapConductorForHERE/marker/HereMarkerController.swift index 5abeaad..9ae7712 100644 --- a/Sources/MapConductorForHERE/marker/HereMarkerController.swift +++ b/Sources/MapConductorForHERE/marker/HereMarkerController.swift @@ -8,6 +8,8 @@ import UIKit @MainActor final class HereMarkerController: AbstractMarkerController { private weak var mapView: MapView? + /// 載せているマーカーのタイルの地図レイヤ名(``HereOverlayStacking`` の並びから外すため)。 + private var tileLayerName: String? private var markerStatesById: [String: MarkerState] = [:] private var markerSubscriptions: [String: AnyCancellable] = [:] private var draggingMarkerId: String? @@ -383,8 +385,11 @@ final class HereMarkerController: AbstractMarkerController [MapPolygon] { - let order = Int32(truncatingIfNeeded: state.zIndex) + let order = OverlayStacking.globalZIndex(OverlayStackKey(.polygon, zIndex: state.zIndex), bandStride: HereOverlayStacking.drawOrderBandStride) let rings = [makeRing(points: state.points, geodesic: state.geodesic)] + state.holes.map { makeRing(points: $0, geodesic: state.geodesic) } diff --git a/Sources/MapConductorForHERE/polyline/HerePolylineOverlayRenderer.swift b/Sources/MapConductorForHERE/polyline/HerePolylineOverlayRenderer.swift index 476a717..4384524 100644 --- a/Sources/MapConductorForHERE/polyline/HerePolylineOverlayRenderer.swift +++ b/Sources/MapConductorForHERE/polyline/HerePolylineOverlayRenderer.swift @@ -1,5 +1,5 @@ import heresdk -import MapConductorCore +@_spi(MapConductorDriver) import MapConductorCore import UIKit @MainActor @@ -13,7 +13,7 @@ final class HerePolylineOverlayRenderer: AbstractPolylineOverlayRenderer MapPolyline? { guard let mapView, let polyline = makePolyline(state: state) else { return nil } - mapView.mapScene.addMapPolyline(polyline) + HereOverlayStacking.addPolyline(polyline, to: mapView) return polyline } @@ -42,13 +42,13 @@ final class HerePolylineOverlayRenderer: AbstractPolylineOverlayRenderer