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

More cleanup

Browse source
This commit is contained in:
Garth Vander Houwen 2023-11-15 08:00:10 -08:00
parent 8e4aa271fd
commit 2ed33ae98b
2 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
View file

@ -98,7 +98,7 @@ struct NodeMapSwiftUI: View {
}
/// Node Annotations
ForEach(positionArray, id: \.id) { position in
let pf = PositionFlags(rawValue: Int(position.nodePosition?.metadata?.positionFlags ?? 3))
let pf = PositionFlags(rawValue: Int(position.nodePosition?.metadata?.positionFlags ?? 771))
let headingDegrees = Angle.degrees(Double(position.heading))
Annotation(position.latest ? node.user?.shortName ?? "?": "", coordinate: position.coordinate) {
ZStack {

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

@ -62,7 +62,6 @@ struct MeshMap: View {
NavigationStack {
ZStack {
MapReader { reader in
Map(position: $position, bounds: MapCameraBounds(minimumDistance: 1, maximumDistance: .infinity), scope: mapScope) {
/// Waypoint Annotations
if waypoints.count > 0 && showWaypoints {
@ -112,23 +111,17 @@ struct MeshMap: View {
}
}
/// Route Lines
if showRouteLines {
let positionArray = position.nodePosition?.positions?.array as? [PositionEntity] ?? []
let routeCoords = positionArray.compactMap({(position) -> CLLocationCoordinate2D in
return position.nodeCoordinate ?? LocationHelper.DefaultLocation
})
if showRouteLines {
let gradient = LinearGradient(
colors: [Color(nodeColor.lighter().lighter()), Color(nodeColor.lighter()), Color(nodeColor)],
startPoint: .leading, endPoint: .trailing
)
let dashed = StrokeStyle(
lineWidth: 3,
lineCap: .round, lineJoin: .round, dash: [10, 10]
)
MapPolyline(coordinates: routeCoords)
.stroke(gradient, style: dashed)
}
if showRouteLines {
let gradient = LinearGradient(
colors: [Color(nodeColor.lighter().lighter()), Color(nodeColor.lighter()), Color(nodeColor)],
startPoint: .leading, endPoint: .trailing
)
let dashed = StrokeStyle(
lineWidth: 3,
lineCap: .round, lineJoin: .round, dash: [10, 10]
)
MapPolyline(coordinates: lineCoords)
.stroke(gradient, style: dashed)
}
/// Node History
if showNodeHistory {