Skip to content

Make clearOverlays() clear the overlay controllers #12

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

Make clearOverlays() clear the overlay controllers #12

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
12 changes: 12 additions & 0 deletions Sources/MapConductorForMapKit/MapKitMapView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable {
controller.registerOverlayController(polygonController)
controller.registerOverlayController(groundImageController)
controller.registerOverlayController(rasterLayerController)
controller.clearOverlaysHandler = { [weak self] in await self?.clearOverlays() }

let overlayScope = MapOverlayScope()
self.overlayScope = overlayScope
Expand Down Expand Up @@ -316,6 +317,17 @@ private struct MapKitMapViewRepresentable: UIViewRepresentable {
}
}

/// android-sdk の `clearOverlays()` と同じく、各オーバーレイのコントローラを空にする。
/// `controller.clearOverlaysHandler` から呼ばれる。
func clearOverlays() async {
await markerController?.clear()
await polylineController?.clear()
await polygonController?.clear()
await groundImageController?.clear()
await circleController?.clear()
await rasterLayerController?.clear()
}

func unbind() {
// 登録した capability を取り下げる。レジストリの持ち主は state で、ビューより長生きするため、
// ここで外さないと破棄済みのコントローラを掴んだまま残る。
Expand Down
8 changes: 5 additions & 3 deletions Sources/MapConductorForMapKit/controller/MapKitViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ final class MapKitViewController: MapViewControllerProtocol {
cancelCameraAnimation()
}

/// ``clearOverlays()`` の中身。オーバーレイのコントローラはホストが持っているので、
/// ホストが生成時に設定する（android-sdk と同じく、各コントローラの `clear()` を呼ぶ）。
var clearOverlaysHandler: (@MainActor () async -> Void)?

func clearOverlays() async {
guard let mapView = mapView else { return }
mapView.removeAnnotations(mapView.annotations)
mapView.removeOverlays(mapView.overlays)
await clearOverlaysHandler?()
}

func setCameraMoveStartListener(listener: OnCameraMoveHandler?) {
Expand Down
Loading