From 91013fe296307650de743f1aa506d21330525cca Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 28 Dec 2016 04:59:27 -0500 Subject: [PATCH] [fix] moving checks inside the add_locatives function, fixing float cast --- scripts/geodata/addresses/components.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index 59401fc6..1b08be24 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -876,10 +876,11 @@ class AddressComponents(object): return six.u(' ').join(norm) def add_locatives(self, address_components, language): - for component in address_components: - locative_probability = float(nested_get(self.config, ('slavic_names', component, 'locative_probability'))) - if locative_probability is not None and random.random() < locative_probability: - address_components[component] = self.locative_name(address_components[component], language) + if language in self.slavic_morphology_analyzers and AddressFormatter.CITY in address_components: + for component in address_components: + locative_probability = nested_get(self.config, ('slavic_names', component, 'locative_probability')) + if locative_probability is not None and random.random() < float(locative_probability): + address_components[component] = self.locative_name(address_components[component], language) def abbreviated_state(self, state, country, language): abbreviate_state_prob = float(nested_get(self.config, ('state', 'abbreviated_probability'))) @@ -1713,8 +1714,7 @@ class AddressComponents(object): self.drop_invalid_components(address_components, country) - if language in self.slavic_morphology_analyzers and AddressFormatter.CITY in address_components: - self.add_locatives(address_components, language) + self.add_locatives(address_components, language) if language_suffix and not non_local_language and not language_altered: language = language_suffix.lstrip(':').lower()