meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check for a valid map file, and update the map immediately upon import

Browse source
This commit is contained in:
Joshua Pirihi 2022-01-29 14:25:08 +13:00
parent e0eb8f32ee
commit d9dc5a9f71
4 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
MeshtasticClient/Views/Map/MapViewModule.swift
View file

@ -17,6 +17,10 @@ public struct MapView: UIViewRepresentable {
//@Binding private var region: MKCoordinateRegion
//make this view dependent on the UserDefault that is updated when importing a new map file
@AppStorage("lastUpdatedLocalMapFile") private var lastUpdatedLocalMapFile = 0
@State private var loadedLastUpdatedLocalMapFile = 0
private var customMapOverlay: CustomMapOverlay?
@State private var presentCustomMapOverlayHash: CustomMapOverlay?
@ -138,7 +142,7 @@ public struct MapView: UIViewRepresentable {
//mapView.region = self.region
//}
if self.customMapOverlay != self.presentCustomMapOverlayHash {
if self.customMapOverlay != self.presentCustomMapOverlayHash || self.loadedLastUpdatedLocalMapFile != self.lastUpdatedLocalMapFile {
mapView.removeOverlays(mapView.overlays)
if let customMapOverlay = self.customMapOverlay {
@ -150,17 +154,19 @@ public struct MapView: UIViewRepresentable {
print("Loading local map file")
let overlay = LocalMBTileOverlay(mbTilePath: tilePath)
if let overlay = LocalMBTileOverlay(mbTilePath: tilePath) {
overlay.canReplaceMapContent = false//customMapOverlay.canReplaceMapContent
overlay.canReplaceMapContent = false//customMapOverlay.canReplaceMapContent
mapView.addOverlay(overlay)
mapView.addOverlay(overlay)
}
} else {
print("Couldn't find a local map file to load")
}
}
DispatchQueue.main.async {
self.presentCustomMapOverlayHash = self.customMapOverlay
self.loadedLastUpdatedLocalMapFile = self.lastUpdatedLocalMapFile
}
}