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

[formatting] giving single hyphens the separator tag

Browse Source
This commit is contained in:
Al
2016-12-26 21:00:25 -05:00
parent d208397ecb
commit 7ec368542b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/geodata/address_formatting/formatter.py
View File

@@ -806,7 +806,8 @@ class AddressFormatter(object):
return self.get_template_from_config(self.templates_place_only, country, language=language) return self.get_template_from_config(self.templates_place_only, country, language=language)
def tagged_tokens(self, name, label): def tagged_tokens(self, name, label):
return six.u(' ').join([six.u('{}/{}').format(t.replace(' ', ''), label if t != ',' else self.separator_tag) for t, c in tokenize(name)]) name = ftfy.fix_encoding(name)
return six.u(' ').join([six.u('{}/{}').format(t.replace(' ', ''), label if t not in (',', '-') else self.separator_tag) for t, c in tokenize(name)])
def template_language_matters(self, country, language): def template_language_matters(self, country, language):
return '{}_{}'.format(country.upper(), language) in self.country_formats or '{}_{}'.format(country, language) in self.country_formats return '{}_{}'.format(country.upper(), language) in self.country_formats or '{}_{}'.format(country, language) in self.country_formats

1
scripts/requirements.txt
View File

@@ -12,6 +12,7 @@ cssselect==0.9.1
distribute==0.7.3 distribute==0.7.3
future==0.15.2 future==0.15.2
futures==3.0.5 futures==3.0.5
ftfy==4.2.0
gevent==1.1.2 gevent==1.1.2
greenlet==0.4.10 greenlet==0.4.10
jmespath==0.9.0 jmespath==0.9.0