From a8a3dab9264575904efcc9193714e3cc245230de Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Nov 2023 23:57:56 -0800 Subject: [PATCH] Don't be dumb --- Meshtastic/Persistence/UpdateCoreData.swift | 3 ++- Meshtastic/Views/Nodes/MeshMap.swift | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift index 552e49cd..e95580a7 100644 --- a/Meshtastic/Persistence/UpdateCoreData.swift +++ b/Meshtastic/Persistence/UpdateCoreData.swift @@ -259,8 +259,9 @@ func upsertPositionPacket (packet: MeshPacket, context: NSManagedObjectContext) /// Don't save the same position over and over. if mutablePositions.count > 0 { let mostRecent = mutablePositions.lastObject as! PositionEntity - if mostRecent.latitudeI == position.latitudeI && mostRecent.longitudeI == position.latitudeI { + if mostRecent.latitudeI == position.latitudeI && mostRecent.longitudeI == position.longitudeI { mutablePositions.remove(mostRecent) + print("Delete stupid fixed position for \(position.nodePosition)") } } mutablePositions.add(position) diff --git a/Meshtastic/Views/Nodes/MeshMap.swift b/Meshtastic/Views/Nodes/MeshMap.swift index b7dce712..245c86a5 100644 --- a/Meshtastic/Views/Nodes/MeshMap.swift +++ b/Meshtastic/Views/Nodes/MeshMap.swift @@ -106,7 +106,17 @@ struct MeshMap: View { } .frame(width: 60, height: 60) } - CircleText(text: position.nodePosition?.user?.shortName ?? "?", color: Color(nodeColor), circleSize: 40) + if position.nodePostion?.hasDetectionSensor ?? false { + Image(systemName: "sensor.fill") + .symbolRenderingMode(.palette) + .symbolEffect(.variableColor) + .padding() + .foregroundStyle(.white) + .background(Color(nodeColor)) + .clipShape(Circle()) + } else { + CircleText(text: position.nodePosition?.user?.shortName ?? "?", color: Color(nodeColor), circleSize: 40) + } } .onTapGesture { location in selectedPosition = (selectedPosition == position ? nil : position)