Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Sources/MapConductorForHERE/HereMapHost.swift
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ public final class HereMapHost: MapViewCoordinatorBase<HereMapViewState>, Marker
)

self.mapView = mapView
// ラスター・グラウンドイメージをマップアイテムより下に置くための錨。アイテムより先に作る。
HereOverlayStacking.installAnchor(on: mapView)
bind(state: state, mapView: mapView)
// android-for-here の HereMapView.kt と同じ位置で適用する。
applyCameraRestriction(cameraRestriction)
Expand Down
133 changes: 133 additions & 0 deletions Sources/MapConductorForHERE/HereOverlayStacking.swift
Original file line number Diff line number Diff line change
@@ -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, &registryKey) as? Registry { return registry }
let registry = Registry()
objc_setAssociatedObject(mapView, &registryKey, 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
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import heresdk
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore
import UIKit

@MainActor
Expand All @@ -19,7 +19,7 @@ final class HereCircleOverlayRenderer: AbstractCircleOverlayRenderer<MapPolygon>
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
}
Expand Down Expand Up @@ -47,7 +47,7 @@ final class HereCircleOverlayRenderer: AbstractCircleOverlayRenderer<MapPolygon>
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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import heresdk
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore

@MainActor
final class HereGroundImageOverlayRenderer: AbstractGroundImageOverlayRenderer<HereGroundImageHandle> {
Expand Down Expand Up @@ -131,6 +131,7 @@ final class HereGroundImageOverlayRenderer: AbstractGroundImageOverlayRenderer<H
.withDataSource(named: sourceName, contentType: .rasterImage)
.forMap(mapView.hereMap)
.build()
HereOverlayStacking.place(layer, named: layerName, OverlayStackKey(.groundImage), on: mapView)

return HereGroundImageHandle(
routeId: routeId,
Expand All @@ -150,6 +151,7 @@ final class HereGroundImageOverlayRenderer: AbstractGroundImageOverlayRenderer<H

private func removeHandle(_ handle: HereGroundImageHandle) {
handle.layer.setEnabled(false)
HereOverlayStacking.remove(named: handle.layerName, on: mapView)
}

private func cacheDirectoryPath() -> String {
Expand Down
7 changes: 7 additions & 0 deletions Sources/MapConductorForHERE/marker/HereMarkerController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import UIKit
@MainActor
final class HereMarkerController: AbstractMarkerController<MapMarker, HereMarkerRenderer> {
private weak var mapView: MapView?
/// 載せているマーカーのタイルの地図レイヤ名(``HereOverlayStacking`` の並びから外すため)。
private var tileLayerName: String?
private var markerStatesById: [String: MarkerState] = [:]
private var markerSubscriptions: [String: AnyCancellable] = [:]
private var draggingMarkerId: String?
Expand Down Expand Up @@ -383,15 +385,20 @@ final class HereMarkerController: AbstractMarkerController<MapMarker, HereMarker
.forMap(mapView.hereMap)
.build()
layer.setEnabled(true)
// マーカーのタイルはマーカーと同じ帯(自分の地図レイヤの中では一番上)。
HereOverlayStacking.place(layer, named: layerName, OverlayStackKey(.marker), on: mapView)
tileDataSource = dataSource
tileLayer = layer
tileLayerName = layerName
} catch {
NSLog("[MapConductor] HERE marker tile layer creation failed: %@", String(describing: error))
}
}

private func removeTileLayer() {
tileLayer?.setEnabled(false)
if let tileLayerName { HereOverlayStacking.remove(named: tileLayerName, on: mapView) }
tileLayerName = nil
tileLayer = nil
tileDataSource = nil
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/MapConductorForHERE/marker/HereMarkerRenderer.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import heresdk
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore
import QuartzCore
import UIKit

Expand Down Expand Up @@ -43,7 +43,7 @@ final class HereMarkerRenderer: MarkerOverlayRendererProtocol {
image: image,
anchor: bitmapIcon.toHereAnchor()
)
marker.drawOrder = Int32(truncatingIfNeeded: state.zIndex ?? 0)
marker.drawOrder = OverlayStacking.globalZIndex(OverlayStackKey(.marker, zIndex: state.zIndex ?? 0), bandStride: HereOverlayStacking.drawOrderBandStride)
marker.opacity = (state.getAnimation() != nil && markerAnimationRunners[state.id] == nil) ? 0.0 : 1.0
appliedIconHashes[state.id] = iconContentHash(pngData, bitmapIcon)
mapView.mapScene.addMapMarker(marker)
Expand Down Expand Up @@ -120,7 +120,7 @@ final class HereMarkerRenderer: MarkerOverlayRendererProtocol {
private func apply(state: MarkerState, bitmapIcon: BitmapIcon, to marker: MapMarker) {
marker.coordinates = state.position.toGeoCoordinates()
marker.anchor = bitmapIcon.toHereAnchor()
marker.drawOrder = Int32(truncatingIfNeeded: state.zIndex ?? 0)
marker.drawOrder = OverlayStacking.globalZIndex(OverlayStackKey(.marker, zIndex: state.zIndex ?? 0), bandStride: HereOverlayStacking.drawOrderBandStride)
marker.opacity = (state.getAnimation() != nil && markerAnimationRunners[state.id] == nil) ? 0.0 : 1.0

// Only rebuild and reassign the MapImage when the icon content actually changed.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import heresdk
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore
import UIKit

/// HERE の穴付きポリゴンは「分割方式」で描画する。
Expand Down Expand Up @@ -73,7 +73,7 @@ final class HerePolygonOverlayRenderer: AbstractPolygonOverlayRenderer<HereActua
}

if finger.zIndex != prevFinger.zIndex {
let order = Int32(truncatingIfNeeded: current.state.zIndex)
let order = OverlayStacking.globalZIndex(OverlayStackKey(.polygon, zIndex: current.state.zIndex), bandStride: HereOverlayStacking.drawOrderBandStride)
polygon.forEach { $0.drawOrder = order }
}
return polygon
Expand Down Expand Up @@ -116,7 +116,7 @@ final class HerePolygonOverlayRenderer: AbstractPolygonOverlayRenderer<HereActua
outlineColor: state.strokeColor,
outlineWidthInPixels: state.strokeWidth
)
polygon.drawOrder = Int32(truncatingIfNeeded: state.zIndex)
polygon.drawOrder = OverlayStacking.globalZIndex(OverlayStackKey(.polygon, zIndex: state.zIndex), bandStride: HereOverlayStacking.drawOrderBandStride)
return [polygon]
}

Expand All @@ -135,7 +135,7 @@ final class HerePolygonOverlayRenderer: AbstractPolygonOverlayRenderer<HereActua
let outerRing = makeRing(points: state.points, geodesic: state.geodesic)
let holeRings = state.holes.map { makeRing(points: $0, geodesic: state.geodesic) }
let pieces = splitPolygonWithHolesIntoSimpleRings(outer: outerRing, holes: holeRings)
let order = Int32(truncatingIfNeeded: state.zIndex)
let order = OverlayStacking.globalZIndex(OverlayStackKey(.polygon, zIndex: state.zIndex), bandStride: HereOverlayStacking.drawOrderBandStride)

var polygons: [MapPolygon] = []
for piece in pieces {
Expand All @@ -156,7 +156,7 @@ final class HerePolygonOverlayRenderer: AbstractPolygonOverlayRenderer<HereActua

/// 輪郭のみ(透明 fill): 外周 + 各穴。塗りは ``buildSplitFillPolygons`` が担当する。
private func buildOutlinePolygons(state: PolygonState) -> [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) }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import heresdk
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore
import UIKit

@MainActor
Expand All @@ -13,7 +13,7 @@ final class HerePolylineOverlayRenderer: AbstractPolylineOverlayRenderer<MapPoly

override func createPolyline(state: PolylineState) async -> MapPolyline? {
guard let mapView, let polyline = makePolyline(state: state) else { return nil }
mapView.mapScene.addMapPolyline(polyline)
HereOverlayStacking.addPolyline(polyline, to: mapView)
return polyline
}

Expand Down Expand Up @@ -42,13 +42,13 @@ final class HerePolylineOverlayRenderer: AbstractPolylineOverlayRenderer<MapPoly
}

if finger.zIndex != prevFinger.zIndex {
polyline.drawOrder = Int32(truncatingIfNeeded: current.state.zIndex)
polyline.drawOrder = OverlayStacking.globalZIndex(OverlayStackKey(.polyline, zIndex: current.state.zIndex), bandStride: HereOverlayStacking.drawOrderBandStride)
needsReAdd = true
}

if needsReAdd {
mapView.mapScene.removeMapPolyline(polyline)
mapView.mapScene.addMapPolyline(polyline)
HereOverlayStacking.addPolyline(polyline, to: mapView)
}

return polyline
Expand All @@ -67,7 +67,7 @@ final class HerePolylineOverlayRenderer: AbstractPolylineOverlayRenderer<MapPoly
guard let geometry = makeGeometry(state: state),
let representation = makeRepresentation(state: state) else { return nil }
let polyline = MapPolyline(geometry: geometry, representation: representation)
polyline.drawOrder = Int32(truncatingIfNeeded: state.zIndex)
polyline.drawOrder = OverlayStacking.globalZIndex(OverlayStackKey(.polyline, zIndex: state.zIndex), bandStride: HereOverlayStacking.drawOrderBandStride)
return polyline
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import heresdk
import MapConductorCore
@_spi(MapConductorDriver) import MapConductorCore
import UIKit

@MainActor
Expand Down Expand Up @@ -111,6 +111,12 @@ final class HereRasterLayerOverlayRenderer: AbstractRasterLayerOverlayRenderer<H
.forMap(mapView.hereMap)
.build()
layer.setEnabled(state.visible)
HereOverlayStacking.place(
layer,
named: tileSpec.layerName,
OverlayStacking.rasterKey(stateId: state.id, zIndex: state.zIndex),
on: mapView
)
return HereRasterLayerHandle(
dataSource: dataSource,
layer: layer,
Expand All @@ -127,6 +133,7 @@ final class HereRasterLayerOverlayRenderer: AbstractRasterLayerOverlayRenderer<H

private func removeHandle(_ handle: HereRasterLayerHandle) {
handle.layer.setEnabled(false)
HereOverlayStacking.remove(named: handle.layerName, on: mapView)
if let routeId = handle.routeId {
tileServer.unregister(routeId: routeId)
}
Expand Down