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

[formatting] fixed a template insertion bug

Browse Source
This commit is contained in:
Al
2017-01-19 03:26:10 -05:00
parent 110665651c
commit b6aa05ee0d
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -455,7 +455,7 @@ class AddressFormatter(object):
tag_match = re.compile(self.tag_token(tag)).search(sans_firsts) tag_match = re.compile(self.tag_token(tag)).search(sans_firsts)
if before: if before:
before_match = re.compile(self.tag_token(after)).search(sans_firsts) before_match = re.compile(self.tag_token(before)).search(sans_firsts)
if before_match and tag_match and before_match.start() > tag_match.start(): if before_match and tag_match and before_match.start() > tag_match.start():
return template return template
@@ -554,7 +554,6 @@ class AddressFormatter(object):
for component in self.BOUNDARY_COMPONENTS_ORDERED[i - 1:0:-1]: for component in self.BOUNDARY_COMPONENTS_ORDERED[i - 1:0:-1]:
kw = {'before': prev} if not is_reverse else {'after': prev} kw = {'before': prev} if not is_reverse else {'after': prev}
template = self.insert_component(template, component, exact_order=False, **kw) template = self.insert_component(template, component, exact_order=False, **kw)
prev = component prev = component
prev = pivot prev = pivot
@@ -563,7 +562,6 @@ class AddressFormatter(object):
for component in self.BOUNDARY_COMPONENTS_ORDERED[i + 1:]: for component in self.BOUNDARY_COMPONENTS_ORDERED[i + 1:]:
kw = {'after': prev} if not is_reverse else {'before': prev} kw = {'after': prev} if not is_reverse else {'before': prev}
template = self.insert_component(template, component, exact_order=False, **kw) template = self.insert_component(template, component, exact_order=False, **kw)
prev = component prev = component
return template return template