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

[fix] Removing template types from AddressFormatter, just drop components as needed

Browse Source
This commit is contained in:
Al
2016-05-22 05:12:06 -04:00
parent 25dede1986
commit 10bbebc1ac
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/geodata/address_formatting/formatter.py
View File

@@ -133,9 +133,6 @@ class AddressFormatter(object):
HOUSE, HOUSE,
} }
PLACE_ONLY = 'place_only'
NO_NAME = 'no_name'
address_formatter_fields = set(component_order) address_formatter_fields = set(component_order)
aliases = Aliases( aliases = Aliases(
@@ -719,10 +716,8 @@ class AddressFormatter(object):
components[self.NEAR] = category_query.prep components[self.NEAR] = category_query.prep
if category_query.add_place_name or category_query.add_address: if category_query.add_place_name or category_query.add_address:
template_type = self.PLACE_ONLY if not category_query.add_address else self.NO_NAME
place_formatted = self.format_address(address_components, country, language=language, place_formatted = self.format_address(address_components, country, language=language,
minimal_only=False, tag_components=tag_components, minimal_only=False, tag_components=tag_components)
template_type=template_type)
if not place_formatted: if not place_formatted:
return None return None
components['place'] = place_formatted components['place'] = place_formatted
@@ -740,10 +735,8 @@ class AddressFormatter(object):
components[self.NEAR] = chain_query.prep components[self.NEAR] = chain_query.prep
if chain_query.add_place_name or chain_query.add_address: if chain_query.add_place_name or chain_query.add_address:
template_type = self.PLACE_ONLY if not chain_query.add_address else self.NO_NAME
components['place'] = self.format_address(address_components, country, language=language, components['place'] = self.format_address(address_components, country, language=language,
minimal_only=False, tag_components=tag_components, minimal_only=False, tag_components=tag_components)
template_type=template_type)
return self.render_template(self.chain_template, components, tagged=tag_components) return self.render_template(self.chain_template, components, tagged=tag_components)
@@ -760,8 +753,7 @@ class AddressFormatter(object):
return self.render_template(self.intersection_template, components, tagged=tag_components) return self.render_template(self.intersection_template, components, tagged=tag_components)
def format_address(self, components, country, language, def format_address(self, components, country, language,
minimal_only=True, tag_components=True, replace_aliases=True, minimal_only=True, tag_components=True, replace_aliases=True):
template_type=None):
if minimal_only and not self.minimal_components(components): if minimal_only and not self.minimal_components(components):
return None return None
@@ -769,14 +761,9 @@ class AddressFormatter(object):
if not template: if not template:
return None return None
if template_type is None: if not template or 'address_template' not in template:
if not template or 'address_template' not in template: return None
return None template_text = template['address_template']
template_text = template['address_template']
elif template_type is self.PLACE_ONLY:
template_text = self.get_place_template(country, language=language)
elif template_type is self.NO_NAME:
template_text = self.get_no_name_template(country, language=language)
template_text = self.revised_template(template_text, components, country, language=language) template_text = self.revised_template(template_text, components, country, language=language)
if template_text is None: if template_text is None: