From bf95eede08128555101dc40486446f109e46b0b3 Mon Sep 17 00:00:00 2001 From: Lukas Melninkas Date: Thu, 25 Apr 2024 21:22:26 +0300 Subject: [PATCH] Detect country before postal code --- pyap/source_US/data.py | 2 +- tests/test_parser_us.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pyap/source_US/data.py b/pyap/source_US/data.py index b818b0d..4d5541a 100644 --- a/pyap/source_US/data.py +++ b/pyap/source_US/data.py @@ -1171,7 +1171,7 @@ 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("a")}?(?:{part_div}{country})?{_postal_code}{_indexed_region1("b")}? |{_indexed_region1("c")}(?![-,.\sA-Za-z]{{0,10}}{postal_code_re})) """ diff --git a/tests/test_parser_us.py b/tests/test_parser_us.py index 5ff8554..437056d 100644 --- a/tests/test_parser_us.py +++ b/tests/test_parser_us.py @@ -477,6 +477,7 @@ def test_full_street_positive(input, expected): # positive assertions ("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),