Skip to content

1601 - Crash on createTileArrays() - Not Thread Safe #167

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
paulsolt-ofsw merged 9 commits into from
Oct 7, 2025
Merged

1601 - Crash on createTileArrays() - Not Thread Safe #167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e288ec
it never needed to be an array
danbenner Sep 16, 2025
d58ffdf
updated name to reflect changes
danbenner Sep 29, 2025
9234821
forcing refresh call to be on main thread
danbenner Sep 29, 2025
4691791
using alternate method to use main thread
danbenner Sep 29, 2025
b9408a9
not sure how those didn't get added in last commit
danbenner Sep 29, 2025
d4e3d5d
this is confirmed to guarantee that they run thread safe
danbenner Sep 30, 2025
1e673a8
more attempts to prevent any potential crashes
danbenner Sep 30, 2025
6c8d4f3
Merge branch 'develop'
danbenner Oct 1, 2025
710e280
Merge branch 'develop' into dbenner/create-tile-arrays-unsafe
paulsolt-ofsw Oct 6, 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
12 changes: 4 additions & 8 deletions Mage/DataSourceMapViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class DataSourceMapViewModel {

@Published var annotations: [DataSourceAnnotation] = []
@Published var featureOverlays: [MKOverlay] = []
@Published var tileOverlays: [DataSourceTileOverlay] = []
@Published var tileOverlay: DataSourceTileOverlay?
Comment thread
danbenner-vega marked this conversation as resolved.

let requerySubject = PassthroughSubject<Void, Never>()

Expand Down Expand Up @@ -112,17 +112,13 @@ class DataSourceMapViewModel {
featureOverlays = features?.overlays ?? []
}

@discardableResult
private func createTileOverlays() -> [MKTileOverlay] {
Comment thread
danbenner-vega marked this conversation as resolved.
guard let repository = repository else {
return []
}
private func createTileOverlays() {
guard let repository = repository else { return }
let newOverlay = DataSourceTileOverlay(tileRepository: repository, key: key)
newOverlay.minimumZ = minZoom
newOverlay.maximumZ = maximumTileZoom

tileOverlays = [newOverlay]
return tileOverlays
tileOverlay = newOverlay
}

func itemKeys(
Expand Down
15 changes: 9 additions & 6 deletions Mage/Mixins/DataSourceMap.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ class DataSourceMap: MapMixin {
}
.store(in: &cancellable)

viewModel?.$tileOverlays
viewModel?.$tileOverlay
.receive(on: DispatchQueue.main)
.sink { [weak self] tileOverlays in
.sink { [weak self] tileOverlay in
Task { [weak self] in
await self?.updateTileOverlays(tileOverlays: tileOverlays)
await self?.updateTileOverlays(tileOverlay: tileOverlay)
}
}
.store(in: &cancellable)
Expand All @@ -86,7 +86,7 @@ class DataSourceMap: MapMixin {
}

@MainActor
private func updateTileOverlays(tileOverlays: [DataSourceTileOverlay]) {
private func updateTileOverlays(tileOverlay: DataSourceTileOverlay?) {
Comment thread
danbenner-vega marked this conversation as resolved.
Outdated
guard let mapView = mapView, let viewModel = viewModel else {
return
}
Expand All @@ -96,7 +96,8 @@ class DataSourceMap: MapMixin {
clearPreviousTiles(previousTiles: previousTiles)
return
}
mapView.addOverlays(tileOverlays, level: .aboveLabels)
guard let tileOverlay = tileOverlay else { return }
mapView.addOverlay(tileOverlay, level: .aboveLabels)
// give the map a chance to draw the new data before we take the old one off the map to prevent flashing
DispatchQueue.main.async {
Timer.scheduledTimer(timeInterval: 0.1, target: self, selector: #selector(self.clearTimer), userInfo: previousTiles, repeats: false)
Expand Down Expand Up @@ -269,7 +270,9 @@ class DataSourceMap: MapMixin {
func removeMixin(mapView: MKMapView, mapState: MapState) {
mapView.removeOverlays(viewModel?.featureOverlays ?? [])
mapView.removeAnnotations(viewModel?.annotations ?? [])
mapView.removeOverlays(viewModel?.tileOverlays ?? [])
if let tileOverlay = viewModel?.tileOverlay {
mapView.removeOverlay(tileOverlay)
}
Comment thread
paulsolt-ofsw marked this conversation as resolved.
for cancellable in cancellable {
cancellable.cancel()
}
Expand Down