tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[addresses] making postcode before {suburb,city} more likely in the UK for #39

Browse Source
This commit is contained in:
Al
2017-03-01 15:43:26 -05:00
parent a5d8700df3
commit 375f7b1684
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/formatting/global.yaml
View File

@@ -500,7 +500,15 @@ countries:
# United Kingdom, in case language is unknown # United Kingdom, in case language is unknown
gb: gb:
insertions: *english_template_insertions insertions:
<<: *english_template_insertions
postcode:
postcode_before_suburb:
before: suburb
probability: 0.1
postcode_before_city:
before: city
probability: 0.1
us: us:
insertions: &us_template_insertions insertions: &us_template_insertions

21
scripts/geodata/addresses/components.py
View File

@@ -1677,19 +1677,24 @@ class AddressComponents(object):
if phrase and phrase != postcode: if phrase and phrase != postcode:
address_components[AddressFormatter.POSTCODE] = phrase address_components[AddressFormatter.POSTCODE] = phrase
def drop_names(self, address_components): @classmethod
return {c: v for c, v in six.iteritems(address_components) if c not in self.NAME_COMPONENTS} def drop_names(cls, address_components):
return {c: v for c, v in six.iteritems(address_components) if c not in cls.NAME_COMPONENTS}
def drop_address(self, address_components): @classmethod
return {c: v for c, v in six.iteritems(address_components) if c not in self.ADDRESS_LEVEL_COMPONENTS} def drop_address(cls, address_components):
return {c: v for c, v in six.iteritems(address_components) if c not in cls.ADDRESS_LEVEL_COMPONENTS}
def drop_places(self, address_components): @classmethod
def drop_places(cls, address_components):
return {c: v for c, v in six.iteritems(address_components) if c not in place_config.ADMIN_COMPONENTS} return {c: v for c, v in six.iteritems(address_components) if c not in place_config.ADMIN_COMPONENTS}
def drop_localities(self, address_components): @classmethod
return {c: v for c, v in six.iteritems(address_components) if c not in self.LOCALITY_COMPONENTS} def drop_localities(cls, address_components):
return {c: v for c, v in six.iteritems(address_components) if c not in cls.LOCALITY_COMPONENTS}
def drop_postcode(self, address_components): @classmethod
def drop_postcode(cls, address_components):
if AddressFormatter.POSTCODE not in address_components: if AddressFormatter.POSTCODE not in address_components:
return address_components return address_components
return {c: v for c, v in six.iteritems(address_components) if c != AddressFormatter.POSTCODE} return {c: v for c, v in six.iteritems(address_components) if c != AddressFormatter.POSTCODE}