dh1tw/pyhamtools
1
0
Fork 0
mirror of https://github.com/dh1tw/pyhamtools.git synced 2026-01-10 02:30:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for 10chars locators - used on higher uWaves

Browse source 
Signed-off-by: Dawid SQ6EMM <sq6emm@hamradio.pl>
This commit is contained in:
Dawid SQ6EMM 2025-04-30 22:09:46 +02:00
parent f6fad0f8cd
commit 547ee643c2
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pyhamtools/locator.py
View file

@ -9,7 +9,7 @@ def latlong_to_locator (latitude, longitude, precision=6):
Args:
latitude (float): Latitude
longitude (float): Longitude
precision (int): 4,6,8 chars (default 6)
precision (int): 4,6,8,10 chars (default 6)
Returns:
string: Maidenhead locator
@ -33,7 +33,7 @@ def latlong_to_locator (latitude, longitude, precision=6):
"""
if precision < 4 or precision ==5 or precision == 7 or precision > 8:
if precision < 4 or precision == 5 or precision == 7 or precision == 9 or precision > 10:
return ValueError
if longitude >= 180 or longitude <= -180:
@ -99,7 +99,7 @@ def locator_to_latlong (locator, center=True):
locator = locator.upper()
if len(locator) < 4 or len(locator) == 5 or len(locator) == 7:
if len(locator) < 4 or len(locator) == 5 or len(locator) == 7 or len(locator) == 9:
raise ValueError
if ord(locator[0]) > ord('R') or ord(locator[0]) < ord('A'):
@ -126,6 +126,12 @@ def locator_to_latlong (locator, center=True):
if ord (locator[7]) > ord('9') or ord(locator[7]) < ord('0'):
raise ValueError
if len(locator) == 10:
if ord(locator[8]) > ord('X') or ord(locator[8]) < ord('A'):
raise ValueError
if ord (locator[9]) > ord('X') or ord(locator[9]) < ord('A'):
raise ValueError
longitude = (ord(locator[0]) - ord('A')) * 20 - 180
latitude = (ord(locator[1]) - ord('A')) * 10 - 90
longitude += (ord(locator[2]) - ord('0')) * 2
@ -156,6 +162,20 @@ def locator_to_latlong (locator, center=True):
longitude += 5.0 / 600 / 2
latitude += 2.5 / 600 / 2
elif len(locator) == 10:
longitude += (ord(locator[4]) - ord('A')) * 5.0 / 60
latitude += (ord(locator[5]) - ord('A')) * 2.5 / 60
longitude += int(locator[6]) * 5.0 / 600
latitude += int(locator[7]) * 2.5 / 600
longitude += (ord(locator[8]) - ord('A')) * 1.0 / 2880
latitude += (ord(locator[9]) - ord('A')) * 1.0 / 5760
if center:
longitude += 1.0 / 2880 / 2
latitude += 1.0 / 5760 / 2
else:
raise ValueError