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

[fix] add_address=True for CategoryQuery/ChainQuery

Browse Source
This commit is contained in:
Al
2016-05-22 05:13:26 -04:00
parent b061c619d3
commit d56c210fb9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,11 +23,11 @@ class Category(object):
prep_phrase_type = CategoryPreposition.random(language, country=country) prep_phrase_type = CategoryPreposition.random(language, country=country)
if prep_phrase_type in (None, CategoryPreposition.NULL): if prep_phrase_type in (None, CategoryPreposition.NULL):
return CategoryQuery(category_phrase, prep=None, add_place_name=True) return CategoryQuery(category_phrase, prep=None, add_place_name=True, add_address=True)
values, probs = address_config.alternative_probabilities('categories.{}'.format(prep_phrase_type), language, country=country) values, probs = address_config.alternative_probabilities('categories.{}'.format(prep_phrase_type), language, country=country)
if not values: if not values:
return CategoryQuery(category_phrase, prep=None, add_place_name=True) return CategoryQuery(category_phrase, prep=None, add_place_name=True, add_address=True)
prep_phrase, prep_phrase_props = weighted_choice(values, probs) prep_phrase, prep_phrase_props = weighted_choice(values, probs)
prep_phrase = safe_decode(prep_phrase) prep_phrase = safe_decode(prep_phrase)

4
scripts/geodata/chains/query.py
View File

@@ -85,11 +85,11 @@ class Chain(object):
prep_phrase_type = CategoryPreposition.random(language, country=country) prep_phrase_type = CategoryPreposition.random(language, country=country)
if prep_phrase_type in (None, CategoryPreposition.NULL): if prep_phrase_type in (None, CategoryPreposition.NULL):
return CategoryQuery(chain_phrase, prep=None, add_place_name=True) return ChainQuery(chain_phrase, prep=None, add_place_name=True, add_address=True)
values, probs = address_config.alternative_probabilities('categories.{}'.format(prep_phrase_type), language, country=country) values, probs = address_config.alternative_probabilities('categories.{}'.format(prep_phrase_type), language, country=country)
if not values: if not values:
return ChainQuery(chain_phrase, prep=None, add_place_name=True) return ChainQuery(chain_phrase, prep=None, add_place_name=True, add_address=True)
prep_phrase, prep_phrase_props = weighted_choice(values, probs) prep_phrase, prep_phrase_props = weighted_choice(values, probs)
prep_phrase = safe_decode(prep_phrase) prep_phrase = safe_decode(prep_phrase)