streamline Lead activity assignment; fix extra space

USEPA · Mar 15, 2024 · 5129a0a · 5129a0a
1 parent 611a9ce
commit 5129a0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USGS_MYB_Lead.csv b/flowsa/data/activitytosectormapping/NAICS_Crosswalk_USGS_MYB_Lead.csv
@@ -1,3 +1,3 @@
 ActivitySourceName,Activity,SectorSourceName,Sector,SectorType,Notes
-USGS_MYB_Lead,"Primary lead, refined content, domestic ores and base bullion ",NAICS_2012_Code,331410,,
+USGS_MYB_Lead,"Primary lead, refined content, domestic ores and base bullion",NAICS_2012_Code,331410,,
 USGS_MYB_Lead,"Secondary lead, lead content",NAICS_2012_Code,331492,,
diff --git a/flowsa/data_source_scripts/USGS_MYB.py b/flowsa/data_source_scripts/USGS_MYB.py
@@ -2015,26 +2015,22 @@ def usgs_lead_parse(*, df_list, source, year, **_):
                   "Lead in base bullion",
                   "Lead in base bullion, lead content",
                   "Base bullion"]
-    import_export = ["Exports, lead content:",
-                     "Imports for consumption, lead content:"]
     dataframe = pd.DataFrame()
     product = "production"
     for df in df_list:
         for index, row in df.iterrows():
-            if df.iloc[index]["Production"].strip() in import_export:
-                if df.iloc[index]["Production"].strip() == \
-                        "Exports, lead content:":
-                    product = "exports"
-                elif df.iloc[index]["Production"].strip() == \
-                        "Imports for consumption, lead content:":
-                    product = "imports"
-            if df.iloc[index]["Production"].strip() in row_to_use:
+            activity = df.iloc[index]["Production"].strip()
+            if activity == "Exports, lead content:":
+                product = "exports"
+            elif activity == "Imports for consumption, lead content:":
+                product = "imports"
+            if activity in row_to_use:
                 data = usgs_myb_static_variables()
                 data["SourceName"] = source
                 data["Year"] = str(year)
                 data["Unit"] = "Metric Tons"
                 data['FlowName'] = name + " " + product
-                data["ActivityProducedBy"] = df.iloc[index]["Production"]
+                data["ActivityProducedBy"] = activity
                 if str(df.iloc[index]["FlowAmount"]) == "--":
                     data["FlowAmount"] = 0
                 else: