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

[addresses] changing a few class/method names

Browse Source
This commit is contained in:
Al
2016-05-18 12:37:06 -04:00
parent bfbe54449a
commit 4f268fdc36
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ PARSER_DEFAULT_CONFIG = os.path.join(this_dir, os.pardir, os.pardir, os.pardir,
'resources', 'parser', 'default.yaml') 'resources', 'parser', 'default.yaml')
class AddressExpander(object): class AddressComponents(object):
''' '''
This class, while it has a few dependencies, exposes a simple method This class, while it has a few dependencies, exposes a simple method
for transforming geocoded input addresses (usually a lat/lon with either for transforming geocoded input addresses (usually a lat/lon with either
@@ -46,8 +46,8 @@ class AddressExpander(object):
prefixes like "London Borough of", pruning duplicates like "Antwerpen, Antwerpen, Antwerpen". prefixes like "London Borough of", pruning duplicates like "Antwerpen, Antwerpen, Antwerpen".
Usage: Usage:
>>> expander = AddressExpander(osm_admin_rtree, language_rtree, neighborhoods_rtree, buildings_rtree, subdivisions_rtree, quattroshapes_rtree, geonames) >>> components = AddressComponents(osm_admin_rtree, language_rtree, neighborhoods_rtree, buildings_rtree, subdivisions_rtree, quattroshapes_rtree, geonames)
>>> expander.expanded_address_components({'name': 'Hackney Empire'}, 51.54559, -0.05567) >>> components.expand({'name': 'Hackney Empire'}, 51.54559, -0.05567)
Returns (results vary because of randomness): Returns (results vary because of randomness):
@@ -290,9 +290,11 @@ class AddressExpander(object):
prob_dist = vals['probabilities'] prob_dist = vals['probabilities']
break break
values = []
probs = []
for num_type in (self.NULL_PHRASE, self.ALPHANUMERIC_PHRASE, self.STANDALONE_PHRASE): for num_type in (self.NULL_PHRASE, self.ALPHANUMERIC_PHRASE, self.STANDALONE_PHRASE):
key = '{}_probability'.format(num_type) key = '{}_probability'.format(num_type)
prob = alphanumeric_props.get(key) prob = component_config.get(key)
if prob is not None: if prob is not None:
values.append(num_type) values.append(num_type)
probs.append(prob) probs.append(prob)
@@ -627,7 +629,7 @@ class AddressExpander(object):
else: else:
return return
phrase = component_class.phrase(num, language, country=countyr, **(phrase_kwargs or {})) phrase = component_class.phrase(num, language, country=country, **(phrase_kwargs or {}))
if phrase: if phrase:
address_components[component] = phrase address_components[component] = phrase
@@ -754,7 +756,7 @@ class AddressExpander(object):
if phrase and phrase != postcode: if phrase and phrase != postcode:
address_components[AddressFormatter.POSTCODE] = phrase address_components[AddressFormatter.POSTCODE] = phrase
def expanded_address_components(self, address_components, latitude, longitude, num_floors=None, num_basements=None, zone=None): def expanded(self, address_components, latitude, longitude, num_floors=None, num_basements=None, zone=None):
try: try:
latitude, longitude = latlon_to_decimal(latitude, longitude) latitude, longitude = latlon_to_decimal(latitude, longitude)
except Exception: except Exception:
@@ -816,7 +818,7 @@ class AddressExpander(object):
return address_components, country, language return address_components, country, language
def limited_address_components(self, address_components, latitude, longitude): def limited(self, address_components, latitude, longitude):
try: try:
latitude, longitude = latlon_to_decimal(latitude, longitude) latitude, longitude = latlon_to_decimal(latitude, longitude)
except Exception: except Exception:
@@ -880,5 +882,4 @@ class AddressExpander(object):
self.replace_names(address_components) self.replace_names(address_components)
self.prune_duplicate_names(address_components) self.prune_duplicate_names(address_components)
return address_components, country, language return address_components, country, language