Bring load_data in line with latest changes in main repo

Specifically ebmdatalab/clinicaltrials-act-tracker#210

load_data.py

@@ -228,9 +228,10 @@ def has_us_loc(locs):
         "Puerto Rico",
         "Virgin Islands (U.S.)",
     ]
-    for us_loc in us_locs:
-        if us_loc in locs:
-            return True
+    if locs:
+        for us_loc in us_locs:
+            if us_loc in locs:
+                return True
     return False
 
 
@@ -591,8 +592,8 @@ def convert_to_csv():
             )
 
             td["keywords"] = dict_or_none(parsed_json, [cs, "keyword"])
-
-            writer.writerow(convert_bools_to_ints(td))
+            if td["act_flag"] or td["included_pact_flag"]:
+                writer.writerow(convert_bools_to_ints(td))
 
 
 def main():