From e6a1d11324576f55ea509426ba9755bada8f5dac Mon Sep 17 00:00:00 2001 From: Al Date: Tue, 31 May 2016 01:59:05 -0400 Subject: [PATCH] [fix] validators --- scripts/geodata/openaddresses/formatter.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py index f0d31a50..03ad60b4 100644 --- a/scripts/geodata/openaddresses/formatter.py +++ b/scripts/geodata/openaddresses/formatter.py @@ -19,7 +19,15 @@ OPENADDRESS_FORMAT_DATA_TAGGED_FILENAME = 'openaddresses_formatted_addresses_tag OPENADDRESS_FORMAT_DATA_FILENAME = 'openaddresses_formatted_addresses.tsv' +def validate_postcode(postcode): + return not all((c == '0' for c in postcode)) + + class OpenAddressesFormatter(object): + openaddresses_validators = { + AddressFormatter.POSTCODE: validate_postcode + } + def __init__(self, language_rtree): self.language_rtree = language_rtree @@ -36,14 +44,6 @@ class OpenAddressesFormatter(object): return value return None - @staticmethod - def validate_postcode(postcode): - return not all((c == '0' for c in postcode)) - - openaddresses_validators = { - AddressFormatter.POSTCODE: validate_postcode - } - def formatted_addresses(self, path, configs, tag_components=True): abbreviate_street_prob = self.get_property('abbreviate_street_probability', *configs) separate_street_prob = self.get_property('separate_street_probability', *configs) or 0.0