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

Sort positions the same way on both maps so we can get latest

Browse source
This commit is contained in:
Garth Vander Houwen 2023-02-10 20:50:25 -08:00
parent 243dd75456
commit f7f09c6705
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift
View file

@ -125,7 +125,7 @@ struct MapViewSwiftUI: UIViewRepresentable {
annotationView.canShowCallout = true
annotationView.glyphText = "📟"
let latest = parent.positions.first(where: { $0.nodePosition?.num ?? 0 == positionAnnotation.nodePosition?.num ?? -1 })
let latest = parent.positions.last(where: { $0.nodePosition?.num ?? 0 == positionAnnotation.nodePosition?.num ?? -1 })
if latest == positionAnnotation {
annotationView.markerTintColor = .systemRed

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

@ -30,7 +30,7 @@ struct NodeMap: View {
}
}
//&& nodePosition != nil
@FetchRequest(sortDescriptors: [NSSortDescriptor(key: "time", ascending: false)],
@FetchRequest(sortDescriptors: [NSSortDescriptor(key: "time", ascending: true)],
predicate: NSPredicate(format: "time >= %@ && nodePosition != nil", Calendar.current.startOfDay(for: Date()) as NSDate), animation: .none)
private var positions: FetchedResults<PositionEntity>