From fe1c264b19a89dc75b565f2e1f6733970facf6cb Mon Sep 17 00:00:00 2001
From: SpudGunMan <kellykeeton@yahoo.com>
Date: Wed, 10 Sep 2025 12:46:01 -0700
Subject: [PATCH] Update locationdata.py

---
 modules/locationdata.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/locationdata.py b/modules/locationdata.py
index 64b62d6..e52cfb0 100644
--- a/modules/locationdata.py
+++ b/modules/locationdata.py
@@ -819,6 +819,8 @@ def distance(lat=0,lon=0,nodeID=0, reset=False):
     # part of the howfar function, calculates the distance between two lat/lon points
     msg = ""
     dupe = False
+    r = 6371 # Radius of earth in kilometers # haversine formula
+    
     if lat == 0 and lon == 0:
         return NO_DATA_NOGPS
     if nodeID == 0:
@@ -848,11 +850,9 @@ def distance(lat=0,lon=0,nodeID=0, reset=False):
         lon2 = math.radians(lon)
         dlon = lon2 - lon1
         dlat = lat2 - lat1
-        # haversine formula
         a = math.sin(dlat / 2)**2 + math.cos(lat1) * math.cos(lat2) * math.sin(dlon / 2)**2
         c = 2 * math.asin(math.sqrt(a))
-        r = 6371 # Radius of earth in kilometers
-        #
+
         distance_km = c * r
         if use_metric:
             msg += f"{distance_km:.2f} km"
@@ -891,6 +891,8 @@ def distance(lat=0,lon=0,nodeID=0, reset=False):
             lon2 = math.radians(point2['lon'])
             dlon = lon2 - lon1
             dlat = lat2 - lat1
+            a = math.sin(dlat / 2)**2 + math.cos(lat1) * math.cos(lat2) * math.sin(dlon / 2)**2
+            c = 2 * math.asin(math.sqrt(a))
             total_distance_km += c * r
         # add the distance from last point to current point
         total_distance_km += distance_km