Skip to content

add support for numbered state highway #90

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
DeviousStoat merged 1 commit into from
Jun 15, 2026
Merged

add support for numbered state highway #90

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
148 changes: 79 additions & 69 deletions pyap/source_US/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,76 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
from_to="{1,5}",
)


def states_abbrvs_regex() -> str:
# Some abbreviations are non-standard
_STATE_ABBRS = {
"AL",
"AK",
"AZ",
"AR",
"CA",
"CO",
"CT",
"DE",
"FL",
"GA",
"HI",
"ID",
"IL",
"IN",
"IA",
"KS",
"KY",
"LA",
"ME",
"MD",
"MA",
"MI(?:CH)?\.?",
"MN",
"MS",
"MO",
"MT",
"NE",
"NV",
"NH",
"NJ",
"NM",
"NY|N\.Y\.",
"NC",
"ND",
"OH",
"OK",
"OR",
"PA",
"RI",
"SC",
"SD",
"TN",
"TX",
"UT",
"VT",
"VA",
"WA",
"WV",
"WI",
"WY",
}
_NON_STATE_ABBRS = {
"AS",
"GU",
"MP",
"PR",
"VI",
"D\.?C\.?",
}
return (
r"(?:"
+ str_list_to_upper_lower_regex(list(_STATE_ABBRS | _NON_STATE_ABBRS))
+ r")(?![A-Za-z])"
)


"""
Regexp for matching street name.
In example below:
Expand Down Expand Up @@ -192,6 +262,12 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
r"""(?:[Aa][Ll][Tt]|[Aa][Ll][Tt][Ee][Rr][Nn][Aa][Tt][Ee])\ \d{1,4}(?!\d)"""
)

# Some states name their state-maintained highways by the state abbreviation
# and the number.
numbered_state_highway = r"""(?:{states}\ \d{{1,4}}(?!\d))""".format(
states=states_abbrvs_regex()
)

# Used to handle edge cases where streets don't have a street type:
# eg. `55 HIGHPOINT`, `600 HIGHWAY 32`
numbered_or_typeless_street_name = r"""
Expand All @@ -211,6 +287,8 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
{numbered_route_re}
|
{numbered_alternate}
|
{numbered_state_highway}
)
)
""".format(
Expand All @@ -223,6 +301,7 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
numbered_road_re=numbered_road_re,
numbered_route_re=numbered_route_re,
numbered_alternate=numbered_alternate,
numbered_state_highway=numbered_state_highway,
)

post_direction = r"""
Expand Down Expand Up @@ -1094,75 +1173,6 @@ def street_type_extended(idx: str) -> str:
)


def states_abbrvs_regex() -> str:
# Some abbreviations are non-standard
_STATE_ABBRS = {
"AL",
"AK",
"AZ",
"AR",
"CA",
"CO",
"CT",
"DE",
"FL",
"GA",
"HI",
"ID",
"IL",
"IN",
"IA",
"KS",
"KY",
"LA",
"ME",
"MD",
"MA",
"MI(?:CH)?\.?",
"MN",
"MS",
"MO",
"MT",
"NE",
"NV",
"NH",
"NJ",
"NM",
"NY|N\.Y\.",
"NC",
"ND",
"OH",
"OK",
"OR",
"PA",
"RI",
"SC",
"SD",
"TN",
"TX",
"UT",
"VT",
"VA",
"WA",
"WV",
"WI",
"WY",
}
_NON_STATE_ABBRS = {
"AS",
"GU",
"MP",
"PR",
"VI",
"D\.?C\.?",
}
return (
r"(?:"
+ str_list_to_upper_lower_regex(list(_STATE_ABBRS | _NON_STATE_ABBRS))
+ r")(?![A-Za-z])"
)


# region1 is actually a "state"
def make_region1(idx: Optional[str] = None):
maybe_idx = f"_{idx}" if idx else ""
Expand Down
2 changes: 2 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 @@ -524,6 +524,7 @@ def test_po_box_positive(input, expected):
("82 ALBRO TRACT", True),
("6123 SHEFFIELD HOUSE", True),
("99 Valley Greens Dr\nSouth Tower", True),
("612 NC 54 Apt B77", True),
# negative assertions
("6 95 34 75 COMPANY PHONE IS", False),
(", 666 Hell ST PMB 29700", False),
Expand Down Expand Up @@ -663,6 +664,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),
("567-55 Arlington Terrace Fl1 \nJamaica, NY 11435", True),
("612 NC 54 Apt B77 \nCarrboro, NC 27510-6105", True),
# negative assertions
("123 Nw Awesome Drive\n12345", False),
("ONE HEALING CENTER LLC, 16444", False),
Expand Down
Loading