From 7acfe47fd78e0b49d718887258d7d767ed13a34b Mon Sep 17 00:00:00 2001
From: Winston Lowe <wel97459@gmail.com>
Date: Fri, 20 Feb 2026 22:09:11 -0800
Subject: [PATCH] Refactor map legend and filtering logic for contacts with
 location, to show count of active markers. (#203)

---
 lib/screens/map_screen.dart | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart
index 8c13a71..ce7a7d1 100644
--- a/lib/screens/map_screen.dart
+++ b/lib/screens/map_screen.dart
@@ -488,7 +488,8 @@ class _MapScreenState extends State<MapScreen> {
                 ),
                 if (!_isBuildingPathTrace)
                   _buildLegend(
-                    contactsWithLocation.length,
+                    contactsWithLocation,
+                    settings,
                     sharedMarkers.length,
                   ),
                 if (_isBuildingPathTrace) _buildPathTraceOverlay(),
@@ -524,13 +525,17 @@ class _MapScreenState extends State<MapScreen> {
       if (!contact.hasLocation) continue;
 
       // Apply node type filters
-      if (contact.type == advTypeRepeater && !settings.mapShowRepeaters) {
+      if (contact.type == advTypeRepeater &&
+          (!settings.mapShowRepeaters && !_isBuildingPathTrace)) {
+        continue;
+      }
+      if (contact.type == advTypeChat &&
+          !(settings.mapShowChatNodes && !_isBuildingPathTrace)) {
         continue;
       }
-      if (contact.type == advTypeChat && !settings.mapShowChatNodes) continue;
       if (contact.type != advTypeChat &&
           contact.type != advTypeRepeater &&
-          !settings.mapShowOtherNodes) {
+          (!settings.mapShowOtherNodes && !_isBuildingPathTrace)) {
         continue;
       }
 
@@ -653,7 +658,26 @@ class _MapScreenState extends State<MapScreen> {
     }
   }
 
-  Widget _buildLegend(int nodeCount, int markerCount) {
+  Widget _buildLegend(
+    List<Contact> contactsWithLocation,
+    settings,
+    int markerCount,
+  ) {
+    int nodeCount = 0;
+    for (final contact in contactsWithLocation) {
+      // Apply node type filters
+      if (contact.type == advTypeRepeater && !settings.mapShowRepeaters) {
+        continue;
+      }
+      if (contact.type == advTypeChat && !settings.mapShowChatNodes) continue;
+      if (contact.type != advTypeChat &&
+          contact.type != advTypeRepeater &&
+          !settings.mapShowOtherNodes) {
+        continue;
+      }
+      nodeCount++;
+    }
+
     return Positioned(
       top: 16,
       right: 16,