From cd25ca1537bfc3141e2afab91c9dd1b353bad19a Mon Sep 17 00:00:00 2001 From: Al Date: Tue, 20 Dec 2016 03:10:13 -0500 Subject: [PATCH] [names] replace name affixes with both country/language and language-only variants --- scripts/geodata/names/normalization.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/geodata/names/normalization.py b/scripts/geodata/names/normalization.py index 65db5b96..11d18cb7 100644 --- a/scripts/geodata/names/normalization.py +++ b/scripts/geodata/names/normalization.py @@ -82,8 +82,10 @@ class NameAffixes(object): re = None if country is not None: re = d.get((country, lang)) - if re is None: - re = d.get(lang) + if re: + name = re.sub(six.u(''), name) + + re = d.get(lang) if not re: return name @@ -101,8 +103,10 @@ class NameAffixes(object): re = None if country is not None: re = d.get((country, lang)) - if re is None: - re = d.get(lang) + if re: + name = re.sub(six.u(''), name) + + re = d.get(lang) if not re: return name