[fix] validators

This commit is contained in:
Al
2016-05-31 01:59:05 -04:00
parent 9ace2fb4e7
commit ededf6373e

View File

@@ -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