Improve location regex (#169)

Ensures the location regex matches more cases.

Fixes #168

scrapd/core/apd.py

@@ -704,11 +704,12 @@ def parse_location_field(page):
     location_pattern = re.compile(
         r'''
         >Location:      # The name of the desired field.
-        .*              # Any character
-        >               # The '>' character
+        \s*             # Any whitespace (at least 2)
+        (?:</span>)?    # Non capture closing strong tag
+        (?:</strong>)?  # Non capture closing strong tag
         \s{2,}          # Any whitespace (at least 2)
-        (?:</strong>)   # Non capture closing strong tag
-        ?([^<]+)        # Capture any character except '<'.
+        (?:</strong>)?  # Non capture closing strong tag
+        ([^<]+)         # Capture any character except '<'.
         ''',
         re.VERBOSE,
     )

tests/core/test_apd.py

@@ -759,6 +759,10 @@ def test_sanitize_fatality_entity(input_, expected):
         '>Location:</strong>     183 service road westbound and Payton Gin Rd.</p>',
         '183 service road westbound and Payton Gin Rd.',
     ),
+    (
+        '<p>	<strong>Location:  </strong>8900 block of N Capital of Texas Highway   </p>',
+        '8900 block of N Capital of Texas Highway   ',
+    ),
 ))
 def test_parse_location_field_00(input_, expected):
     """Ensure."""