Skip to content

WIP: Bug Fixes #295

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

Open
srikanth-vg wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

WIP: Bug Fixes #295

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2046a3
Fixed duplicate annotations issue after answering the multi quests
srikanth-vg Nov 3, 2025
932e143
Fixed missing warning message
srikanth-vg Nov 3, 2025
0b05e95
updated passing cluster manager to reload function
srikanth-vg Nov 4, 2025
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
35 changes: 28 additions & 7 deletions GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,17 +149,36 @@ struct CustomMap: UIViewRepresentable {
var previosMultiSelectionMode: Bool = false
private var annotations: [DisplayUnitAnnotation] = []
private(set) var clusterManager: ClusterManager = ClusterManager<DisplayUnitAnnotation>(configuration: .init(maxZoomLevel: 17, minCountForClustering: 2, clusterPosition: .nearCenter))
lazy private(set) var mapReloader: MapReloader = MapReloader(coordinator: self)

init(_ parent: CustomMap, shadowOverlay: ShadowOverlay) {
self.parent = parent
self.contextualInfo = parent.contextualInfo
self.shadowOverlay = shadowOverlay
}

func reloadMap() async {
guard let mapView = mapView else { return }
async let changes = clusterManager.reload(mapViewSize: mapView.bounds.size, coordinateRegion: mapView.region)
await applyChanges(changes)
actor MapReloader {
private var currentTask: Task<Void, Never>?
let coordinator: Coordinator

init(coordinator: Coordinator) {
self.coordinator = coordinator
}

func reload(using mapView: MKMapView?) {
// Cancel the old reload if it's still running
currentTask?.cancel()

currentTask = Task {
guard let mapView = mapView else { return }
async let changes = coordinator.clusterManager.reload(
mapViewSize: mapView.bounds.size,
coordinateRegion: mapView.region
)
debugPrint("map issue insertions: \(await changes.insertions.count) deletions: \(await changes.removals.count)")
await coordinator.applyChanges(changes)
}
}
}

@MainActor
Expand Down Expand Up @@ -405,7 +424,9 @@ struct CustomMap: UIViewRepresentable {
}

func mapView(_ mapView: MKMapView, regionDidChangeAnimated animated: Bool) {
Task { await reloadMap() }
Task {
await mapReloader.reload(using: mapView)
}
}

private func selectedAnAnnotation(selectedQuest: DisplayUnitAnnotation) {
Expand Down Expand Up @@ -522,7 +543,7 @@ struct CustomMap: UIViewRepresentable {
private func manageAnnotations(_ mapView: MKMapView, context: Context) async {

await context.coordinator.clusterManager.removeAll()
await context.coordinator.reloadMap()
await context.coordinator.mapReloader.reload(using: mapView)
// let existingCoordinates = mapView.annotations.compactMap {
// ($0 as? DisplayUnitAnnotation)?.coordinate
// }
Expand All @@ -544,7 +565,7 @@ struct CustomMap: UIViewRepresentable {
.filter { !$0.isHidden }
.map { $0.annotation }
await context.coordinator.clusterManager.add(visibleAnnotations)
await context.coordinator.reloadMap()
await context.coordinator.mapReloader.reload(using: mapView)
}

func adjustCoordinateForOverlap(_ coordinate: CLLocationCoordinate2D, with index: Int) -> CLLocationCoordinate2D {
Expand Down