Merge pull request #83 from argyle-engineering/match-lot-occupancy-type

match lot and block occupancy type

Author: caiquejjx

pyap/source_US/data.py

@@ -902,10 +902,11 @@ def street_type_list_to_regex(street_type_list: list[str]) -> str:
     ten_to_ninety=ten_to_ninety,
 )
 
-occupancy_details = r"(?:[A-Za-z\#\&\-\d]{{1,7}}(?:\s?{post_direction_re})?)".format(
-    post_direction_re=post_direction_re
+occupancy_details = (
+    r"(?:(?:\#\ )?[A-Za-z\#\&\-\d]{{1,7}}(?:\s?{post_direction_re})?)".format(
+        post_direction_re=post_direction_re
+    )
 )
-
 occupancy = r"""
             (?P<occupancy>
                 (?:
@@ -934,7 +935,10 @@ def street_type_list_to_regex(street_type_list: list[str]) -> str:
                             |
                             # Space
                             [Ss][Pp][Cc]|[Ss][Pp][Aa][Cc][Ee]
-                        )\b[\ \,\.]+
+                            |
+                            # Lot
+                            [Ll][Oo][Tt]
+                        )\b[\ \,\.]*
                         {occupancy_details}? 
                         |
                         \d{{2,4}}\ [Ss][Tt][Ee](?:\ \*)?
@@ -957,6 +961,11 @@ def street_type_list_to_regex(street_type_list: list[str]) -> str:
                         # the `ST.` in `ST. LOUIS`
                         [Ss][Tt][Ee]?\b[\ \,\.]+{occupancy_details}
                     )
+                    |
+                    (?:
+                        #Block abbreviated as B
+                        [Bb]\d{{1,4}}
+                    )
                 )
             )
             """.format(
@@ -1267,7 +1276,6 @@ def make_full_address(
     country: Optional[str] = None,
     phone_number: str = phone_number,
 ) -> str:
-
     return r"""
                 (?P<full_address>
                     {full_street}

tests/test_parser_us.py

@@ -363,9 +363,11 @@ def test_building(input, expected):
         ("Suite 3 South", True),
         ("Suite 3 North", True),
         ("Suite 4 Northeast", True),
+        ("Lot#18", True),
+        ("B2", True),
+        ("apt # 2d", True),
         # negative assertions
         ("suite900 ", False),
-        ("Suite#2", False),
         ("suite218 ", False),
     ],
 )
@@ -648,6 +650,8 @@ def test_full_street_positive(input, expected):
         ("1234 WOODMONT DRIVE NORTHWEST APT# APT F-15 LENOIR NC 28645", True),
         ("1234 N Front Street\nSuite 3 South\nHarrisburg, PA 17102", True),
         ("206 La Rue France, Lafayette, LA, 70508", True),
+        ("1234 Fowlstown Rd Lot#18 \nBainbridge, GA  39817", True),
+        ("1234 LONG LANE\nB2 \nUPPER DARBY PA 19082", True),
         # negative assertions
         ("ONE HEALING CENTER LLC, 16444", False),
         ("85 STEEL REGULAR SHAFT - NE", False),