Skip to content

Commit 2e75084

Browse files
authored
Merge pull request #84 from argyle-engineering/chase-street-type
Handle another street type and typeless alternate street name
2 parents 8e544d8 + 2694011 commit 2e75084

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

pyap/source_US/data.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
188188

189189
numbered_route_re = r"""[Rr][Oo][Uu][Tt][Ee]\ \d{1,4}(?!\d)"""
190190

191+
numbered_alternate = (
192+
r"""(?:[Aa][Ll][Tt]|[Aa][Ll][Tt][Ee][Rr][Nn][Aa][Tt][Ee])\ \d{1,4}(?!\d)"""
193+
)
194+
191195
# Used to handle edge cases where streets don't have a street type:
192196
# eg. `55 HIGHPOINT`, `600 HIGHWAY 32`
193197
numbered_or_typeless_street_name = r"""
@@ -205,6 +209,8 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
205209
{numbered_road_re}
206210
|
207211
{numbered_route_re}
212+
|
213+
{numbered_alternate}
208214
)
209215
)
210216
""".format(
@@ -216,6 +222,7 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
216222
numbered_avenue_re=numbered_avenue_re,
217223
numbered_road_re=numbered_road_re,
218224
numbered_route_re=numbered_route_re,
225+
numbered_alternate=numbered_alternate,
219226
)
220227

221228
post_direction = r"""
@@ -301,6 +308,7 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
301308
"Centers",
302309
"Centr",
303310
"Centre",
311+
"Chase",
304312
"Cir",
305313
"Circ",
306314
"Circl",

tests/test_parser_us.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ def test_street_name(input, expected):
176176
("Parkway", True),
177177
("STATE ROAD 123", True),
178178
("W. STATE ROAD 123", True),
179+
("Alt 123", True),
180+
("Alternate 123", True),
179181
# negative assertions
180182
],
181183
)
@@ -514,6 +516,9 @@ def test_po_box_positive(input, expected):
514516
("123 SE 4 NE", True),
515517
("123 Route 70", True),
516518
("1234 WOODMONT DRIVE NORTHWEST", True),
519+
("123 WHITNEY CHASE", True),
520+
("123 Chase street", True),
521+
("123 Chase Wimbledom St.", True),
517522
# negative assertions
518523
("6 95 34 75 COMPANY PHONE IS", False),
519524
(", 666 Hell ST PMB 29700", False),

0 commit comments

Comments
 (0)