From dd8f8b4d7bbc22492c08fafaae8e56a343d5fb58 Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 5 Dec 2015 18:41:22 -0500 Subject: [PATCH] [fix] prefix/suffix regexes --- scripts/geodata/names/normalization.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/names/normalization.py b/scripts/geodata/names/normalization.py index a93521ed..03442559 100644 --- a/scripts/geodata/names/normalization.py +++ b/scripts/geodata/names/normalization.py @@ -6,6 +6,7 @@ from geodata.encoding import safe_decode name_prefixes = ['{} '.format(s) for s in ( 'city of', 'township of', + 'regional municipality of', 'municipality of', 'borough of', 'london borough of', @@ -17,8 +18,8 @@ name_suffixes = [' {}'.format(s) for s in ( 'municipality', )] -name_prefix_regex = re.compile('^{}'.format('|'.join(name_prefixes)), re.I | re.UNICODE) -name_suffix_regex = re.compile('{}$'.format('|'.join(name_suffixes)), re.I | re.UNICODE) +name_prefix_regex = re.compile('^(?:{})'.format('|'.join(name_prefixes)), re.I | re.UNICODE) +name_suffix_regex = re.compile('(?:{})$'.format('|'.join(name_suffixes)), re.I | re.UNICODE) def replace_name_prefixes(name):