Skip to content

Clear strategy-driven markers in clearOverlays() #10

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 8, 2026
Merged

Clear strategy-driven markers in clearOverlays() #10

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
18 changes: 18 additions & 0 deletions Sources/MapConductorForHERE/HereMapHost.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,17 @@ public final class HereMapHost: MapViewCoordinatorBase<HereMapViewState>, Marker
applyStrategyRendering(nil)
}

/// `clearOverlays()` から呼ばれる。strategy は接続したまま、描いたマーカーだけを消す。
/// 同じインスタンスの一覧が送られている間は描かず、顔ぶれが変わるか作り直された state が
/// 来たら描き直す（StrategyMarkerManager.clearMarkers・オーバーレイのコレクタと同じ）。
public func clearMarkers() async {
strategyClearedUntilListChanges = true
await strategyMarkerController?.clear()
}

/// ``clearMarkers()`` の後、一覧が変わるまで描かない印。
private var strategyClearedUntilListChanges = false

public func beginContentPass() {
strategyConnectedThisPass = false
}
Expand All @@ -340,6 +351,7 @@ public final class HereMapHost: MapViewCoordinatorBase<HereMapViewState>, Marker
let renderer = HereMarkerRenderer(mapView: mapView)
strategyMarkerRenderer = renderer
strategyMarkerController = StrategyMarkerController(strategy: strategy, renderer: renderer)
strategyClearedUntilListChanges = false
// find() の android 同等 screen 空間判定用に geo→screen 投影を注入する。
strategyMarkerController?.markerProjector = { [weak self] geo in
guard let mapView = self?.mapView,
Expand Down Expand Up @@ -380,6 +392,10 @@ public final class HereMapHost: MapViewCoordinatorBase<HereMapViewState>, Marker
newStatesById[state.id] = state
}
strategyMarkerStatesById = newStatesById
if strategyClearedUntilListChanges {
guard shouldSyncList else { return }
strategyClearedUntilListChanges = false
}

for id in oldIds.subtracting(newIds) {
strategyMarkerSubscriptions[id]?.cancel()
Expand Down Expand Up @@ -457,6 +473,8 @@ public final class HereMapHost: MapViewCoordinatorBase<HereMapViewState>, Marker
await groundImageController?.clear()
await circleController?.clear()
await rasterLayerController?.clear()
// strategy（クラスタリングなど）が描いたマーカーも消す。
await state.serviceRegistry.clearMarkerRendering()
}

public func unbind() {
Expand Down