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

Merge remote-tracking branch 'refs/remotes/origin/2.2.22_Working_Changes'

Browse source
This commit is contained in:
Garth Vander Houwen 2024-02-12 22:09:36 -08:00
commit c14ff8d075
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Meshtastic/Helpers/Map/OfflineTileManager.swift
View file

@ -110,7 +110,7 @@ class OfflineTileManager: ObservableObject {
if fileManager.fileExists(atPath: tilesUrl.path) {
return tilesUrl
} else {
if UserDefaults.enableOfflineMaps { // Get and persist newTile
if UserDefaults.enableOfflineMaps, UserDefaults.mapTileServer.zoomRange.contains(path.z) { // Get and persist newTile
return persistLocally(path: path)
} else { // Else display empty tile (transparent over Maps tiles)
return Bundle.main.url(forResource: "alpha", withExtension: "png")!
@ -148,8 +148,9 @@ class OfflineTileManager: ObservableObject {
try data.write(to: filename)
} catch {
print("💀 Save Tile Error = \(error)")
return url
}
return url
return filename
}
private func filterTilesAlreadyExisting(paths: [MKTileOverlayPath]) -> [MKTileOverlayPath] {
paths.filter {

2
Meshtastic/Views/Nodes/NodeMap.swift
View file

@ -223,7 +223,7 @@ struct NodeMap: View {
.padding(.bottom)
#endif
}
.presentationDetents([UserDefaults.enableOfflineMaps || UserDefaults.enableOverlayServer ? .large : .medium])
.presentationDetents([enableOfflineMaps || enableOverlayServer ? .large : .medium])
.presentationDragIndicator(.visible)
}
}