From c76796cdc37275b638bf7625e94cfb3d7515f4cd Mon Sep 17 00:00:00 2001
From: Winston Lowe <wel97459@gmail.com>
Date: Thu, 26 Mar 2026 21:37:50 -0700
Subject: [PATCH] Enhance path hop resolution by adding distance checks to
 improve candidate selection accuracy

---
 lib/screens/channel_message_path_screen.dart | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/screens/channel_message_path_screen.dart b/lib/screens/channel_message_path_screen.dart
index de83ac68..0eb2c220 100644
--- a/lib/screens/channel_message_path_screen.dart
+++ b/lib/screens/channel_message_path_screen.dart
@@ -840,7 +840,8 @@ List<_PathHop> _buildPathHops(
       : null;
   var previousPosition = startPoint;
   final distance = Distance();
-
+  var lastDistance = 0.0;
+  var bestDistance = 0.0;
   final hops = <_PathHop>[];
   for (var i = 0; i < pathBytes.length; i++) {
     final searchPoint = i == 0 ? startPoint : previousPosition;
@@ -849,7 +850,7 @@ List<_PathHop> _buildPathHops(
     if (candidates != null && candidates.isNotEmpty) {
       var bestIndex = 0;
       if (searchPoint != null) {
-        var bestDistance = double.infinity;
+        bestDistance = double.infinity;
         for (var j = 0; j < candidates.length; j++) {
           final candidate = candidates[j];
           if (!candidate.hasLocation ||
@@ -877,6 +878,16 @@ List<_PathHop> _buildPathHops(
     if (resolvedPosition != null) {
       previousPosition = resolvedPosition;
     }
+    // If the best candidate is much farther than the previous hop, it's likely not the correct match.
+    if (lastDistance + bestDistance > 70000 &&
+        candidates != null &&
+        candidates.isNotEmpty) {
+      i--;
+      lastDistance = bestDistance;
+      continue;
+    }
+    lastDistance = bestDistance;
+
     hops.add(
       _PathHop(
         index: i + 1,