tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[coordinates] Better handling for float DMS coordinates

Browse Source
This commit is contained in:
Al
2015-10-14 15:10:58 -04:00
parent e584745061
commit 153c8c9cc4
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/geodata/coordinates/conversion.py
View File

@@ -39,7 +39,18 @@ def direction_sign(d):
raise ValueError('Invalid direction: {}'.format(d)) raise ValueError('Invalid direction: {}'.format(d))
def int_or_float(d):
try:
return int(d)
except ValueError:
return float(d)
def degrees_to_decimal(degrees, minutes, seconds): def degrees_to_decimal(degrees, minutes, seconds):
degrees = int_or_float(degrees)
minutes = int_or_float(minutes)
seconds = int_or_float(seconds)
return degrees + (minutes / 60.0) + (seconds / 3600.0) return degrees + (minutes / 60.0) + (seconds / 3600.0)
@@ -59,7 +70,7 @@ def latlon_to_decimal(latitude, longitude):
if lat_dms: if lat_dms:
d, m, s, c = lat_dms.groups() d, m, s, c = lat_dms.groups()
sign = direction_sign(c) sign = direction_sign(c)
latitude = degrees_to_decimal(int(d or 0), int(m or 0), int(s or 0)) latitude = degrees_to_decimal(d or 0, m or 0, s or 0)
have_lat = True have_lat = True
elif lat_dir: elif lat_dir:
d, c = lat_dir.groups() d, c = lat_dir.groups()
@@ -76,7 +87,7 @@ def latlon_to_decimal(latitude, longitude):
if lon_dms: if lon_dms:
d, m, s, c = lon_dms.groups() d, m, s, c = lon_dms.groups()
sign = direction_sign(c) sign = direction_sign(c)
longitude = degrees_to_decimal(int(d or 0), int(m or 0), int(s or 0)) longitude = degrees_to_decimal(d or 0, m or 0, s or 0)
have_lon = True have_lon = True
elif lon_dir: elif lon_dir:
d, c = lon_dir.groups() d, c = lon_dir.groups()