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

[addresses] Implementing number_min_abs_value, number_max_abs_value outside of number_abs_value constraint

Browse Source
This commit is contained in:
Al
2016-06-16 01:44:12 +02:00
parent c76e7ab776
commit 1f08cce1a7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/geodata/addresses/numbering.py
View File

@@ -241,13 +241,16 @@ class NumberedComponent(object):
if phrase_props.get('number_abs_value', False): if phrase_props.get('number_abs_value', False):
num = abs(num) num = abs(num)
if 'number_min_abs_value' in phrase_props and num < phrase_props['number_min_abs_value']: if 'number_min_abs_value' in phrase_props and num < phrase_props['number_min_abs_value']:
return phrase return None
if phrase_props.get('number_subtract_abs_value'): if 'number_max_abs_value' in phrase_props and num > phrase_props['number_max_abs_value']:
num -= phrase_props['number_subtract_abs_value'] return None
num = safe_decode(num) if phrase_props.get('number_subtract_abs_value'):
num -= phrase_props['number_subtract_abs_value']
num = safe_decode(num)
# Do we add the numeric phrase e.g. Floor No 1 # Do we add the numeric phrase e.g. Floor No 1
add_number_phrase = props.get('add_number_phrase', False) add_number_phrase = props.get('add_number_phrase', False)
@@ -256,8 +259,6 @@ class NumberedComponent(object):
whitespace_default = True whitespace_default = True
num = safe_decode(num)
if num_type == 'numeric_affix': if num_type == 'numeric_affix':
phrase = props['affix'] phrase = props['affix']
if props.get('upper_case', True): if props.get('upper_case', True):