From d208397ecb0a9089c77a9c5c757a7bfcc99e2b6d Mon Sep 17 00:00:00 2001 From: Al Date: Mon, 26 Dec 2016 16:58:10 -0500 Subject: [PATCH] [addresses] checking if component is generated in combining fields --- scripts/geodata/addresses/components.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index f19a8f31..ab251fe1 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -497,13 +497,14 @@ class AddressComponents(object): def combine_fields(self, address_components, language, country=None, generated=None): combo_config = address_config.get_property('components.combinations', language, country=country, default={}) + combos = [] probs = {} for combo in combo_config: components = OrderedDict.fromkeys(combo['components']).keys() - if not all((is_numeric(address_components.get(c, generated.get(c))) for c in components)): + if not all((is_numeric(address_components.get(c, generated.get(c))) or c in generated for c in components)): if combo['probability'] == 1.0: for c in components: if c in address_components and c in generated: