Skip to content

Don't match incomplete street name #88

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

Merged
lmelninkas merged 1 commit into from
Mar 18, 2026
Merged

Don't match incomplete street name #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions pyap/source_US/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,17 +827,20 @@ def street_type_list_to_regex(street_type_list: list[str]) -> str:

street_types_leading_re = street_type_list_to_regex(street_type_leading_list)

street_type_extended = r"""

def street_type_extended(idx: str) -> str:
return r"""
(?:
{street_type_a}
(?P<route_id>
{street_type}
(?P<route_id_{idx}>
{space_div}\(?[Rr][Oo][Uu][Tt][Ee]\ [A-Za-z0-9]+(?:\ ?\))?
)?
)
""".format(
street_type_a=rf"(?P<street_type_a>{street_types_with_interstate_re})",
space_div=space_div,
)
""".format(
street_type=rf"(?P<street_type_{idx}>{street_types_with_interstate_re})",
idx=idx,
space_div=space_div,
)


typed_street_name = r"""
Expand All @@ -852,7 +855,7 @@ def street_type_list_to_regex(street_type_list: list[str]) -> str:
""".format(
space_div=space_div,
street_name_a=rf"(?P<street_name_a>{street_name_multi_word_re})",
street_type_a=street_type_extended,
street_type_a=street_type_extended("a"),
street_type_b=rf"(?P<street_type_b>{street_types_leading_re})",
street_name_b=rf"(?P<street_name_b>{street_name_one_word_re})",
post_direction_re=post_direction_re,
Expand Down Expand Up @@ -1052,7 +1055,7 @@ def street_type_list_to_regex(street_type_list: list[str]) -> str:
|
(?:
{post_direction_re}\
\d{{,3}}[A-Za-z\-]{{1,31}}
\d{{,3}}[A-Za-z\-]{{1,31}}(?!\s+{street_type})
)
)
(?:{space_div}{post_direction})?
Expand Down Expand Up @@ -1080,6 +1083,7 @@ def street_type_list_to_regex(street_type_list: list[str]) -> str:
street_number=street_number,
typed_street_name=typed_street_name,
numbered_or_typeless_street_name=numbered_or_typeless_street_name,
street_type=street_type_extended("c"),
post_direction=post_direction,
post_direction_re=post_direction_re,
floor=floor,
Expand Down
3 changes: 2 additions & 1 deletion tests/test_parser_us.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def test_post_direction(input, expected):
)
def test_street_type(input, expected):
"""tests string match for a street id"""
execute_matching_test(input, expected, data_us.street_type_extended)
execute_matching_test(input, expected, data_us.street_type_extended("a"))


@pytest.mark.parametrize(
Expand Down Expand Up @@ -662,6 +662,7 @@ def test_full_street_positive(input, expected):
("1234 Fowlstown Rd Lot#18 \nBainbridge, GA 39817", True),
("1234 LONG LANE\nB2 \nUPPER DARBY PA 19082", True),
# negative assertions
("123 Nw Awesome Drive\n12345", False),
("ONE HEALING CENTER LLC, 16444", False),
("85 STEEL REGULAR SHAFT - NE", False),
("3 STRUCTURE WITH PE", False),
Expand Down
Loading