From c29d1ad94738b2a591553040576a4309b661d8a2 Mon Sep 17 00:00:00 2001 From: Al Date: Thu, 16 Jun 2016 01:44:12 +0200 Subject: [PATCH] [addresses] Implementing number_min_abs_value, number_max_abs_value outside of number_abs_value constraint --- scripts/geodata/addresses/numbering.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/geodata/addresses/numbering.py b/scripts/geodata/addresses/numbering.py index 0a678b5d..a362286f 100644 --- a/scripts/geodata/addresses/numbering.py +++ b/scripts/geodata/addresses/numbering.py @@ -241,13 +241,16 @@ class NumberedComponent(object): if phrase_props.get('number_abs_value', False): num = abs(num) - if 'number_min_abs_value' in phrase_props and num < phrase_props['number_min_abs_value']: - return phrase + if 'number_min_abs_value' in phrase_props and num < phrase_props['number_min_abs_value']: + return None - if phrase_props.get('number_subtract_abs_value'): - num -= phrase_props['number_subtract_abs_value'] + if 'number_max_abs_value' in phrase_props and num > phrase_props['number_max_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 add_number_phrase = props.get('add_number_phrase', False) @@ -256,8 +259,6 @@ class NumberedComponent(object): whitespace_default = True - num = safe_decode(num) - if num_type == 'numeric_affix': phrase = props['affix'] if props.get('upper_case', True):