Merge pull request #80 from argyle-engineering/more-matches

More matches

Author: DeviousStoat

pyap/source_US/data.py

@@ -159,7 +159,7 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
                         [Ss][Oo][Uu][Tt][Hh]|
                         [Ee][Aa][Ss][Tt]|
                         [Ww][Ee][Ss][Tt]
-                    )
+                    ){1,2}
                     |
                     \b(?:[Nn][Ww]|[Nn][Ee]|[Ss][Ww]|[Ss][Ee])\b
                     |
@@ -186,6 +186,8 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
 
 numbered_road_re = r"""[Ss][Tt][Aa][Tt][Ee]\ [Rr][Oo][Aa][Dd]\ \d{1,4}(?!\d)"""
 
+numbered_route_re = r"""[Rr][Oo][Uu][Tt][Ee]\ \d{1,4}(?!\d)"""
+
 # 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"""
@@ -201,6 +203,8 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
             {numbered_avenue_re}
             |
             {numbered_road_re}
+            |
+            {numbered_route_re}
         )
     )
 """.format(
@@ -211,6 +215,7 @@ def str_list_to_upper_lower_regex(str_list: List[str]) -> str:
     highway_re=highway_re,
     numbered_avenue_re=numbered_avenue_re,
     numbered_road_re=numbered_road_re,
+    numbered_route_re=numbered_route_re,
 )
 
 post_direction = r"""

tests/test_parser_us.py

@@ -196,6 +196,8 @@ def test_numbered_or_typeless_street_name(input, expected):
         ("NW", True),
         ("SE", True),
         ("S.E.", True),
+        ("NORTHWEST", True),
+        ("southeast", True),
         # negative assertions
         ("NW.", False),
         ("NS", False),
@@ -503,6 +505,8 @@ def test_po_box_positive(input, expected):
         ("15 ROUTE 9H", True),
         ("123 w 456 s", True),
         ("123 SE 4 NE", True),
+        ("123 Route 70", True),
+        ("1234 WOODMONT DRIVE NORTHWEST", True),
         # negative assertions
         ("6 95 34 75 COMPANY PHONE IS", False),
         (", 666 Hell ST PMB 29700", False),
@@ -635,6 +639,8 @@ def test_full_street_positive(input, expected):
         ("1234 PEDDY RD SPC   42,RIVERSIDE,CA,92509", True),
         ("123 Blackwood street Ap B5 Philadelphia, PA 19116", True),
         ("123 w 456 s mighey, IN  46953", True),
+        ("123 Route 75 STE 155 Toms River, NJ 08755", True),
+        ("1234 WOODMONT DRIVE NORTHWEST APT# APT F-15 LENOIR NC 28645", True),
         # negative assertions
         ("ONE HEALING CENTER LLC, 16444", False),
         ("85 STEEL REGULAR SHAFT - NE", False),