Ld-Hagen/GPXtoCNXConverter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimization, more accurate distance calculation

Browse Source
This commit is contained in:
Maksim Ivanov
2025-12-05 21:47:23 +03:00
committed by GitHub
parent 50498c916f
commit 8af502422c
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/gpx2cnx.py
View File

@@ -9,6 +9,7 @@ from tkinter import filedialog, scrolledtext
import decimal import decimal
from decimal import Decimal, getcontext from decimal import Decimal, getcontext
import src.poi_types_editor as PE import src.poi_types_editor as PE
import time
getcontext().prec = 28 getcontext().prec = 28
@@ -88,18 +89,26 @@ class GPX2CNX:
return reparsed.toprettyxml(indent=" ") return reparsed.toprettyxml(indent=" ")
# Calculate 3D distance between coordinates # Calculate 3D distance between coordinates
def calc_distance(self): @staticmethod
R = 6371 * 1000 # Earth radius in meters def calc_distance(point1, point2):
dlat = Decimal(str(math.radians(self.lat2 - self.lat1))) R = 6371009 # Earth radius in meters
dlon = Decimal(str(math.radians(self.lon2 - self.lon1)))
dele = Decimal(str(self.ele2 - self.ele1)) lat1 = math.radians(point1['lat'])
a = Decimal(str((math.sin(dlat/2) * math.sin(dlat/2)) + lon1 = math.radians(point1['lon'])
(math.cos(math.radians(self.lat1)) * math.cos(math.radians(self.lat2)) * ele1 = point1['ele']
math.sin(dlon/2) * math.sin(dlon/2)))) lat2 = math.radians(point2['lat'])
b = Decimal(str(2 * math.atan2(math.sqrt(a), math.sqrt(1 - a)))) lon2 = math.radians(point2['lon'])
h_distance = R * b ele2 = point2['ele']
distance = (h_distance**2 + dele**2).sqrt() # 3D distance
return distance dlon = lon2 - lon1
dele = ele2 - ele1
a = Decimal.from_float((math.cos(lat2) * math.sin(dlon))**2 +
(math.cos(lat1) * math.sin(lat2) - math.sin(lat1) * math.cos(lat2) * math.cos(dlon))**2).sqrt()
b = Decimal.from_float(math.sin(lat1) * math.sin(lat2) +
math.cos(lat1) * math.cos(lat2) * math.cos(dlon))
dist = (Decimal.from_float((math.atan2(a,b) * R)**2) + dele**2).sqrt()
return dist
# Converts a list of GPX files to CNX xml format # Converts a list of GPX files to CNX xml format
def convert_gpx2cnx(self, gpx_files): def convert_gpx2cnx(self, gpx_files):
@@ -143,17 +152,11 @@ class GPX2CNX:
distance = Decimal('0.0') distance = Decimal('0.0')
ascent = Decimal('0.0') ascent = Decimal('0.0')
descent = Decimal('0.0') descent = Decimal('0.0')
if len(track_points) > 1: if len(track_points) > 1:
for i in range(1, len(track_points)): for i in range(1, len(track_points)):
self.lat1 = track_points[i - 1]['lat'] distance += self.calc_distance(track_points[i-1], track_points[i])
self.lon1 = track_points[i - 1]['lon'] ele_diff = track_points[i]['ele'] - track_points[i-1]['ele']
self.ele1 = track_points[i - 1]['ele']
self.lat2 = track_points[i]['lat']
self.lon2 = track_points[i]['lon']
self.ele2 = track_points[i]['ele']
distance += self.calc_distance()
ele_diff = self.ele2 - self.ele1
if ele_diff > 0: if ele_diff > 0:
ascent += ele_diff ascent += ele_diff
@@ -192,10 +195,10 @@ class GPX2CNX:
relative_points.append(f"{lat_diff},{lon_diff},{ele_diff}") relative_points.append(f"{lat_diff},{lon_diff},{ele_diff}")
for i in range(1, len(first_diffs)): # Calc second diffs if i > 1: # Third point and subsequent
lat_diff = (first_diffs[i][0] - first_diffs[i-1][0]).quantize(Decimal('1'), decimal.ROUND_HALF_UP) lat_diff = (lat_diff - first_diffs[i-2][0]).quantize(Decimal('1'), decimal.ROUND_HALF_UP)
lon_diff = (first_diffs[i][1] - first_diffs[i-1][1]).quantize(Decimal('1'), decimal.ROUND_HALF_UP) lon_diff = (lon_diff - first_diffs[i-2][1]).quantize(Decimal('1'), decimal.ROUND_HALF_UP)
ele_diff = (first_diffs[i][2]).quantize(Decimal('1'), decimal.ROUND_HALF_UP) ele_diff = (ele_diff).quantize(Decimal('1'), decimal.ROUND_HALF_UP)
relative_points.append(f"{lat_diff},{lon_diff},{ele_diff}") relative_points.append(f"{lat_diff},{lon_diff},{ele_diff}")