From 4aa56b15311a43389ff79d8565f97667e2f044aa Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 21 Oct 2025 06:28:33 -0700 Subject: [PATCH] Fix bad merge --- .../Map/MapContent/MeshMapContent.swift | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift b/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift index 4edb6ac4..707ee1da 100644 --- a/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift +++ b/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift @@ -49,12 +49,6 @@ struct MeshMapContent: MapContent { ForEach(positions, id: \.id) { position in /// Apply favorits filter and don't show ignored nodes if (!showFavorites || (position.nodePosition?.favorite == true)) && !(position.nodePosition?.ignored == true) { - - let nodeColor = UIColor(hex: UInt32(position.nodePosition?.num ?? 0)) - let positionName = position.nodePosition?.user?.longName ?? "?" - // Use a hash of the position ID to stagger animation delays for each node, preventing synchronized animations and improving visual distinction. - let calculatedDelay = Double(position.id.hashValue % 100) / 100.0 * 0.5 - let coordinateForNodePin: CLLocationCoordinate2D = if position.isPreciseLocation { // Precise location: place node pin at actual location. position.coordinate @@ -62,16 +56,6 @@ struct MeshMapContent: MapContent { // Imprecise location: fuzz slightly so overlapping nodes are visible and clickable at highest zoom levels. position.fuzzedCoordinate } - - Annotation(positionName, coordinate: coordinateForNodePin) { - LazyVStack { - AnimatedNodePin( - nodeColor: nodeColor, - shortName: position.nodePosition?.user?.shortName, - hasDetectionSensorMetrics: position.nodePosition?.hasDetectionSensorMetrics ?? false, - isOnline: position.nodePosition?.isOnline ?? false, - calculatedDelay: calculatedDelay - ) if 12...15 ~= position.precisionBits || position.precisionBits == 32 { let nodeColor = UIColor(hex: UInt32(position.nodePosition?.num ?? 0)) @@ -89,7 +73,7 @@ struct MeshMapContent: MapContent { // Use a hash of the position ID to stagger animation delays for each node, preventing synchronized animations and improving visual distinction. let calculatedDelay = Double(position.id.hashValue % 100) / 100.0 * 0.5 - Annotation(positionName, coordinate: position.coordinate) { + Annotation(positionName, coordinate: coordinateForNodePin) { LazyVStack { AnimatedNodePin( nodeColor: nodeColor,