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

[addresses] abbreviating neighborhoods/city_districts

Browse Source
This commit is contained in:
Al
2016-12-20 03:01:34 -05:00
parent 53723bbf3d
commit 9e44fcb2bb
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -950,8 +950,8 @@ class AddressComponents(object):
def neighborhood_components(self, latitude, longitude): def neighborhood_components(self, latitude, longitude):
return self.neighborhoods_rtree.point_in_poly(latitude, longitude, return_all=True) return self.neighborhoods_rtree.point_in_poly(latitude, longitude, return_all=True)
def add_neighborhoods(self, address_components, def add_neighborhoods(self, address_components, neighborhoods,
neighborhoods, language_suffix=''): country, language, language_suffix=''):
''' '''
Neighborhoods Neighborhoods
------------- -------------
@@ -1004,9 +1004,14 @@ class AddressComponents(object):
neighborhood_levels[neighborhood_level].append(name) neighborhood_levels[neighborhood_level].append(name)
neighborhood_components = {}
for component, neighborhoods in neighborhood_levels.iteritems(): for component, neighborhoods in neighborhood_levels.iteritems():
if component not in address_components: if component not in address_components:
address_components[component] = neighborhoods[0] neighborhood_components[component] = neighborhoods[0]
self.abbreviate_admin_components(neighborhood_components, country, language)
address_components.update(neighborhood_components)
def generate_sub_building_component(self, component, address_components, language, country=None, **kw): def generate_sub_building_component(self, component, address_components, language, country=None, **kw):
existing = address_components.get(component, None) existing = address_components.get(component, None)
@@ -1473,7 +1478,7 @@ class AddressComponents(object):
normalize_languages=all_languages, normalize_languages=all_languages,
language_suffix=language_suffix) language_suffix=language_suffix)
self.add_neighborhoods(address_components, neighborhoods, self.add_neighborhoods(address_components, neighborhoods, country, language,
language_suffix=language_suffix) language_suffix=language_suffix)
street = address_components.get(AddressFormatter.ROAD) street = address_components.get(AddressFormatter.ROAD)
@@ -1579,7 +1584,7 @@ class AddressComponents(object):
normalize_languages=all_languages, normalize_languages=all_languages,
random_key=False) random_key=False)
self.add_neighborhoods(address_components, neighborhoods, self.add_neighborhoods(address_components, neighborhoods, country, language,
language_suffix=language_suffix) language_suffix=language_suffix)
self.replace_name_affixes(address_components, non_local_language or language) self.replace_name_affixes(address_components, non_local_language or language)

2
scripts/geodata/openaddresses/formatter.py
View File

@@ -464,7 +464,7 @@ class OpenAddressesFormatter(object):
neighborhood_components = [] neighborhood_components = []
if add_osm_neighborhoods: if add_osm_neighborhoods:
neighborhood_components = self.components.neighborhood_components(latitude, longitude) neighborhood_components = self.components.neighborhood_components(latitude, longitude)
self.components.add_neighborhoods(components, neighborhood_components) self.components.add_neighborhoods(components, neighborhood_components, country, language)
self.components.cleanup_boundary_names(components) self.components.cleanup_boundary_names(components)
self.components.country_specific_cleanup(components, country) self.components.country_specific_cleanup(components, country)