From 64d0783e73612ad3da1e21070a2b1fe10de97383 Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 25 Feb 2017 23:19:12 -0500 Subject: [PATCH] [addresses] Chinese and Colombian house number regex changes --- scripts/geodata/openaddresses/formatter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py index 4474dbee..91cd06f4 100644 --- a/scripts/geodata/openaddresses/formatter.py +++ b/scripts/geodata/openaddresses/formatter.py @@ -48,7 +48,7 @@ number_space_letter_regex = re.compile('^[\d]+\s+[a-z]$', re.I) number_slash_number_regex = re.compile('^(?:[\d]+|[a-z]|[\d]+[a-z]|[a-z][\d]+)[\s]*/[\s]*(?:[\d]+|[a-z]|[\d]+[a-z]|[a-z][\d]+)$', re.I) number_fraction_regex = re.compile('^(?:[\d]+\s+)?(?:1[\s]*/[\s]*[234]|2[\s]*/[\s]*3)$') -colombian_standard_house_number_regex = re.compile('^(\d+[\s]*[a-z]?) ([a-z]?[\d]+[\s]*[a-z]?)?', re.I) +colombian_standard_house_number_regex = re.compile('^(\d+[\s]*[a-z]?)(?: ([a-z]?[\d]+[\s]*[a-z]?))?', re.I) dutch_house_number_regex = re.compile('([\d]+)( [a-z])?( [\d]+)?', re.I) @@ -192,7 +192,7 @@ class OpenAddressesFormatter(object): } } - chinese_annex_regex = re.compile(u'([\d]+)(?![号栋])', re.U) + chinese_annex_regex = re.compile(u'([\d]+)(?![\d号栋])', re.U) @classmethod def format_chinese_house_number(cls, house_number):