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

No more yolo

Browse source
This commit is contained in:
Garth Vander Houwen 2023-11-15 07:01:35 -08:00
parent 41412fd2ba
commit 8e4aa271fd
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Meshtastic/Views/Nodes/MeshMap.swift
View file

@ -71,7 +71,6 @@ struct MeshMap: View {
ZStack {
CircleText(text: String(UnicodeScalar(Int(waypoint.icon)) ?? "📍"), color: Color.orange, circleSize: 40)
.onTapGesture(perform: { location in
let pinLocation = reader.convert(location, from: .local)
selectedWaypoint = (selectedWaypoint == waypoint ? nil : waypoint)
})
}
@ -84,8 +83,6 @@ struct MeshMap: View {
MapPolygon(coordinates: hull)
.stroke(.blue, lineWidth: 3)
.foregroundStyle(.indigo.opacity(0.4))
//.stroke(Color(nodeColor.darker()), lineWidth: 3)
//.foregroundStyle(Color(nodeColor).opacity(0.4))
}
/// Position Annotations
ForEach(Array(positions), id: \.id) { position in
@ -107,7 +104,6 @@ struct MeshMap: View {
self.scale = 1
}
.frame(width: 60, height: 60)
}
CircleText(text: position.nodePosition?.user?.shortName ?? "?", color: Color(nodeColor), circleSize: 40)
}
@ -137,7 +133,7 @@ struct MeshMap: View {
/// Node History
if showNodeHistory {
ForEach(Array(position.nodePosition!.positions!) as! [PositionEntity], id: \.self) { (mappin: PositionEntity) in
if mappin.latest == false { //} position.nodePosition.user.vip ?? false {
if mappin.latest == false && mappin.nodePosition?.user?.vip ?? false {
let pf = PositionFlags(rawValue: Int(mappin.nodePosition?.metadata?.positionFlags ?? 771))
let headingDegrees = Angle.degrees(Double(mappin.heading))
Annotation("", coordinate: mappin.coordinate) {