Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle various edge cases around US postal code #51

Merged
merged 2 commits into from
Apr 26, 2024
+6 −3
Merged

Handle various edge cases around US postal code #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2918212
Detect postal code after a line break
lmelninkas Apr 25, 2024
b005cf1
Detect country before postal code
lmelninkas Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pyap/source_US/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,7 @@ def make_region1(idx: Optional[str] = None):

country = r"""
(?:
[Uu]\.?[Ss]\.?[Aa]\.?|
[Uu]\.?[Ss]\.?(?:[Aa]\.?)?|
[Uu][Nn][Ii][Tt][Ee][Dd]\ [Ss][Tt][Aa][Tt][Ee][Ss](?:\ [Oo][Ff]\ [Aa][Mm][Ee][Rr][Ii][Cc][Aa])?
)
"""
Expand All @@ -1171,8 +1171,8 @@ def _indexed_region1(idx: Optional[str] = None):

_postal_code = f"""(?:{part_div}|\-)? {postal_code}"""
return rf"""
(?:{_indexed_region1("a")}?{_postal_code}{_indexed_region1("b")}?
|{_indexed_region1("c")}(?![-,.\ A-Za-z]{{0,10}}{postal_code_re}))
(?:{_indexed_region1("a")}?(?:{part_div}{country})?{_postal_code}{_indexed_region1("b")}?
|{_indexed_region1("c")}(?![-,.\sA-Za-z]{{0,10}}{postal_code_re}))
"""


Expand Down
3 changes: 3 additions & 0 deletions tests/test_parser_us.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,10 @@ def test_full_street_positive(input, expected):
"input,expected",
[
# positive assertions
("2755 CARPENTER RD SUITE 1W\nANN ARBOR, MI, US, 48108", True),
("P.O. BOX 10323 PH (205) 595-3511\nBIRMINGHAM, AL 35202", True),
("25 HARBOR PARK DRIVE\nPORT WASHINGTON\nNY 11050", True),
("222 W. Las Colinas Blvd\nSuite 900N\nIrving, Texas, USA 75039-5421", True),
("1100 VIRGINIA DR\nFORT WASHINGTON, PA, 19034", True),
("3602 HIGHPOINT\nSAN ANTONIO TX78217", True),
("8025 BLACK HORSE\nSTE 300\nPLEASANTVILLE NJ 08232", True),
Expand Down
Loading