From 2f4548664f50ef440544adca6c5d27a304aaaa1a Mon Sep 17 00:00:00 2001 From: Al Date: Mon, 4 Jul 2016 18:09:50 -0400 Subject: [PATCH] [addresses] Implementing list-based field combinations --- scripts/geodata/addresses/components.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index 1ddee57a..3afc30ba 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -404,7 +404,7 @@ class AddressComponents(object): probs = {} generated_components = generated_components or set() - for k, combo in six.iteritems(combo_config): + for combo in combo_config: components = OrderedDict.fromkeys(combo['components']).keys() if not all((c in address_components and (c in generated_components or is_numeric(address_components[c])) for c in components)): continue @@ -414,8 +414,6 @@ class AddressComponents(object): if not combos: return None - combos.sort(key=operator.itemgetter(0), reverse=True) - for num_components, combo in combos: prob = combo['probability'] if random.random() < prob: