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

[categories/chains] Reusing category config in chain queries

Browse Source
This commit is contained in:
Al
2016-05-20 16:00:04 -04:00
parent b50120f45c
commit ce381134fb
4 changed files with 77 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/geodata/categories/query.py
View File

@@ -14,6 +14,12 @@ NULL_CATEGORY_QUERY = CategoryQuery(None, None, False)
class Category(object):
NEAR = 'near'
NEARBY = 'nearby'
NEAR_ME = 'near_me'
IN = 'in'
NULL = 'null'
@classmethod
def phrase(cls, language, key, value, is_plural=False, country=None):
category_phrase = category_config.get_phrase(language, key, value, is_plural=is_plural)
@@ -29,7 +35,7 @@ class Category(object):
values = []
probs = []
for prep_phrase_type in ('near', 'nearby', 'near_me', 'in', 'null'):
for prep_phrase_type in (cls.NEAR, cls.NEARBY, cls.NEAR_ME, cls.IN, cls.NULL):
k = '{}_probability'.format(prep_phrase_type)
prob = category_props.get(k, None)
if prob is not None:
@@ -40,7 +46,7 @@ class Category(object):
prep_phrase_type = weighted_choice(values, probs)
if prep_phrase_type == 'null':
if prep_phrase_type == cls.NULL:
return CategoryQuery(category_phrase, prep=None, add_place_name=True)
values, probs = address_config.alternative_probabilities('categories.{}'.format(prep_phrase_type), language, country=country)
@@ -50,6 +56,6 @@ class Category(object):
prep_phrase, prep_phrase_props = weighted_choice(values, probs)
prep_phrase = safe_decode(prep_phrase)
add_place_name = prep_phrase_type not in ('nearby', 'near_me')
add_place_name = prep_phrase_type not in (cls.NEARBY, cls.NEAR_ME)
return CategoryQuery(category_phrase, prep=prep_phrase, add_place_name=add_place_name)