Skip to content

Build no marker icons before the MarkerListIdentity gate on MapKit #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wf9a5m75 merged 1 commit into from
Nov 9, 2026
Merged

Build no marker icons before the MarkerListIdentity gate on MapKit #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 20 additions & 24 deletions Sources/MapConductorForMapKit/MapKitMapView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,9 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable {
private weak var draggingAnnotationView: MKAnnotationView?
private var dragDisplayLink: CADisplayLink?

// Store icon for each marker state to provide to delegate (best-effort cache).
// `mapView(_:viewFor:)` should not depend on this cache because it can be called
// before `updateContent` finishes populating it.
private var markerIcons: [String: BitmapIcon] = [:]
private var markerStates: [String: MarkerState] = [:]
/// アイコンを持たないマーカーの絵。1 枚を使い回す（`DefaultMarkerIcon()` を毎回作ると
/// そのたびに描き直しになる）。
private let defaultBitmapIcon = DefaultMarkerIcon().toBitmapIcon()

private lazy var strategyManager = StrategyMarkerManager<MKPointAnnotation, MapKitMarkerRenderer>(
makeRenderer: { [weak self] strategy in
Expand Down Expand Up @@ -362,8 +360,6 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable {
groundImageController = nil
overlayScope?.clear()
overlayScope = nil
markerIcons.removeAll()
markerStates.removeAll()

strategyMarkerIcons.removeAll()
strategyManager.clear()
Expand All @@ -376,15 +372,11 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable {
}
infoBubbleCoordinator?.syncInfoBubbles(content.infoBubbles)

// Prime marker caches before triggering MKMapView annotation creation.
// (MapKit can ask for annotation views immediately after addAnnotation.)
markerIcons = content.markers.reduce(into: [:]) { dict, marker in
dict[marker.id] = (marker.state.icon ?? DefaultMarkerIcon()).toBitmapIcon()
}
markerStates = content.markers.reduce(into: [:]) { dict, marker in
dict[marker.id] = marker.state
}

// マーカーは門番（MarkerListIdentity、syncMarkers の入口）を通るものだけを触る。
// ここで全マーカーのアイコンや辞書を作ると、同じ一覧の再送でも body の評価ごとに
// 14.4 万本ぶん（@Published の icon の読み出しと、アイコンを持たないマーカーの
// 描き直し）が走り、門番が意味を失う。アイコンは `mapView(_:viewFor:)` が
// その場で state から引き、追加直後の state はコントローラが同期的に持っている。
markerController?.tilingOptions = content.markerTilingOptions
markerController?.syncMarkers(content.markers)
overlayScope?.circleCollector.sync(content.circles.map { $0.state })
Expand Down Expand Up @@ -513,25 +505,29 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable {
let mapConductorAnnotation = pointAnnotation as? MapConductorPointAnnotation
let markerIdString = mapConductorAnnotation?.markerId ?? pointAnnotation.title ?? ""
let markerState = markerController?.getMarkerState(for: markerIdString)
?? markerStates[markerIdString]
?? markerController?.syncedMarkerState(for: markerIdString)
?? strategyManager.controller?.markerManager.getEntity(markerIdString)?.state
?? mapConductorAnnotation?.markerState
let cachedIcon = markerIcons[markerIdString] ?? mapConductorAnnotation?.initialBitmapIcon
?? strategyMarkerIcons[markerIdString]
// アイコンは state の今の値から引く（`toBitmapIcon()` はアイコンごとに描いた絵を
// 覚えているので軽い）。in-place で差し替えたアイコンも、ビューが作り直されたときに
// 古い絵へ戻らない。
let stateIcon = markerState.map { $0.icon?.toBitmapIcon() ?? defaultBitmapIcon }
let fallbackIcon = mapConductorAnnotation?.initialBitmapIcon ?? strategyMarkerIcons[markerIdString]

// If this isn't one of our markers, allow MapKit's default behavior.
if markerState == nil, cachedIcon == nil { return nil }
if markerState == nil, fallbackIcon == nil { return nil }

// Avoid returning nil here; returning nil makes MapKit fall back to the default pin annotation.
let resolvedIcon = cachedIcon ?? (markerState?.icon ?? DefaultMarkerIcon()).toBitmapIcon()
let resolvedIcon = stateIcon ?? fallbackIcon ?? defaultBitmapIcon

let identifier = "MapKitMarker"
let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: identifier)
?? MKAnnotationView(annotation: annotation, reuseIdentifier: identifier)

annotationView.annotation = annotation
if let markerState {
if markerController?.getMarkerState(for: markerIdString) != nil || markerStates[markerIdString] != nil {
if markerController?.getMarkerState(for: markerIdString) != nil
|| markerController?.syncedMarkerState(for: markerIdString) != nil {
markerController?.renderer.configureAnnotationView(annotationView, for: markerState, bitmapIcon: resolvedIcon)
} else {
strategyManager.renderer?.configureAnnotationView(annotationView, for: markerState, bitmapIcon: resolvedIcon)
Expand Down Expand Up @@ -559,7 +555,7 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable {
guard let pointAnnotation = view.annotation as? MKPointAnnotation,
let markerId = pointAnnotation.title,
let markerState = markerController?.getMarkerState(for: markerId)
?? markerStates[markerId]
?? markerController?.syncedMarkerState(for: markerId)
?? strategyManager.controller?.markerManager.getEntity(markerId)?.state else {
return
}
Expand All @@ -580,7 +576,7 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable {
guard let pointAnnotation = view.annotation as? MKPointAnnotation,
let markerId = pointAnnotation.title,
let markerState = markerController?.getMarkerState(for: markerId)
?? markerStates[markerId] else {
?? markerController?.syncedMarkerState(for: markerId) else {
return
}

Expand Down
6 changes: 6 additions & 0 deletions Sources/MapConductorForMapKit/marker/MapKitMarkerController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ final class MapKitMarkerController: AbstractMarkerController<MKPointAnnotation,
markerManager.getEntity(id)?.state
}

/// 最後に `syncMarkers` で受け取った一覧の state。`add` の Task が登録を終える前
/// （MapKit は `addAnnotation` の直後にビューを求めることがある）にも引ける。
func syncedMarkerState(for id: String) -> MarkerState? {
markerStatesById[id]
}

func getIcon(for state: MarkerState) -> BitmapIcon {
let resolvedIcon = state.icon ?? DefaultMarkerIcon()
return resolvedIcon.toBitmapIcon()
Expand Down
Loading