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

[coordinates] adding to_valid_latitude to bound 90 and -90 degrees

Browse Source
This commit is contained in:
Al
2016-10-04 02:58:01 -04:00
parent 5900f4bec9
commit 990fdff473
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import math
import re import re
from geodata.encoding import safe_decode from geodata.encoding import safe_decode
from geodata.math.floats import isclose
beginning_re = re.compile('^[^0-9\-]+', re.UNICODE) beginning_re = re.compile('^[^0-9\-]+', re.UNICODE)
end_re = re.compile('[^0-9]+$', re.UNICODE) end_re = re.compile('[^0-9]+$', re.UNICODE)
@@ -78,6 +79,19 @@ def is_valid_longitude(longitude):
return not math.isinf(longitude) and not math.isnan(longitude) return not math.isinf(longitude) and not math.isnan(longitude)
def to_valid_latitude(latitude):
'''Convert longitude into the -180 to 180 scale'''
if not is_valid_latitude(latitude):
raise ValueError('Invalid latitude {}'.format(latitude))
if isclose(latitude, 90.0):
latitude = 89.9999
elif isclose(latitude, -90.0):
latitude = -89.9999
return latitude
def to_valid_longitude(longitude): def to_valid_longitude(longitude):
'''Convert longitude into the -180 to 180 scale''' '''Convert longitude into the -180 to 180 scale'''
if not is_valid_longitude(longitude): if not is_valid_longitude(longitude):
@@ -145,6 +159,7 @@ def latlon_to_decimal(latitude, longitude):
if not is_valid_longitude(longitude): if not is_valid_longitude(longitude):
raise ValueError('Invalid longitude: {}'.format(longitude)) raise ValueError('Invalid longitude: {}'.format(longitude))
latitude = to_valid_latitude(latitude)
longitude = to_valid_longitude(longitude) longitude = to_valid_longitude(longitude)
return latitude, longitude return latitude, longitude