[places] Using all of the ideas that apply to places from address formatting for the places-only data set

This commit is contained in:
Al
2016-08-02 03:16:08 -04:00
parent 4ab60cd4fc
commit f29d043544

View File

@@ -562,15 +562,23 @@ class OSMAddressFormatter(object):
if address_country:
address_components[AddressFormatter.COUNTRY] = address_country
new_address_components = place_config.dropout_components(address_components, osm_components, country=country, population=population)
new_address_components[component_name] = address_components[component_name]
revised_address_components = place_config.dropout_components(address_components, osm_components, country=country, population=population)
revised_address_components[component_name] = address_components[component_name]
self.components.drop_invalid_components(revised_address_components)
self.components.normalize_place_names(revised_address_components, osm_components, country=country, languages=all_local_languages)
self.components.drop_invalid_components(new_address_components)
self.components.replace_name_affixes(revised_address_components, language)
self.components.replace_names(revised_address_components)
if new_address_components:
revised_place_tags.append((new_address_components, language, is_default))
self.components.remove_numeric_boundary_names(revised_address_components)
self.componetns.cleanup_boundary_names(revised_address_components)
return revised_place_tags, country
self.add_postcode_phrase(revised_address_components, language, country=country)
if revised_address_components:
revised_place_tags.append((revised_address_components, language, is_default))
return revised_place_tags, country
def category_queries(self, tags, address_components, language, country=None, tag_components=True):
formatted_addresses = []