modified the pipeline config options

Fixes #28

Author: audiracmichelle

src/aggregate_climate_types.py

@@ -39,8 +39,8 @@ def main(cfg):
     )
 
     # read shapefile
-    idvar = cfg.shapefiles[cfg.shapefile_polygon_name][cfg.shapefile_year].idvar
-    shp_path = f"data/input/shapefiles/shapefile_{cfg.shapefile_polygon_name}_{cfg.shapefile_year}/shapefile.shp"
+    idvar = cfg.shapefiles[cfg.shapefile_polygon_name][cfg.shapefile_tag].idvar
+    shp_path = f"data/input/shapefiles/{cfg.shapefile_polygon_name}_{cfg.shapefile_tag}/{cfg.shapefile_polygon_name}_{cfg.shapefile_tag}.shp"
     LOGGER.info(f"Reading shapefile {shp_path}")
     shp = gpd.read_file(shp_path)
     LOGGER.info(f"Read shapefile with head\n: {shp.drop(columns='geometry').head()}")
@@ -91,7 +91,7 @@ def main(cfg):
     LOGGER.info(f"Fraction of locations with ties: {100 * frac_ties:.2f}%")
 
     intermediate_dir = f"data/intermediate/climate_pcts"
-    pcts_file = f"{intermediate_dir}/climate_pcts_{cfg.shapefile_polygon_name}_{cfg.shapefile_year}.json"
+    pcts_file = f"{intermediate_dir}/climate_pcts_{cfg.shapefile_polygon_name}_{cfg.shapefile_tag}.json"
     LOGGER.info(f"Saving pcts to {pcts_file}")
     with open(pcts_file, "w") as f:
         json.dump(avs, f)
@@ -107,7 +107,7 @@ def main(cfg):
     class_df["climate_type_long"] = class_df["climate_type_num"].map(codedict_long) # if a polygon intersects only with water then there is no assignment
     class_df = class_df.drop(columns="climate_type_num")
 
-    class_file = f"{intermediate_dir}/climate_types_{cfg.shapefile_polygon_name}_{cfg.shapefile_year}.csv"
+    class_file = f"{intermediate_dir}/climate_types_{cfg.shapefile_polygon_name}_{cfg.shapefile_tag}.csv"
     LOGGER.info(f"Saving classification to {class_file}")
     class_df.to_csv(class_file, index=False)
 
@@ -123,7 +123,7 @@ def main(cfg):
 
     output_df = pd.merge(class_df, output_df, on="id")
 
-    output_file = f"data/output/climate_types_raster2polygon/climate_types_{cfg.shapefile_polygon_name}_{cfg.shapefile_year}.parquet"
+    output_file = f"data/output/climate_types_raster2polygon/climate_types_{cfg.shapefile_polygon_name}_{cfg.shapefile_tag}.parquet"
     LOGGER.info(f"Saving output to {output_file}")
     output_df.rename(columns={"id": cfg.shapefile_polygon_name}, inplace=True)
     output_df.to_parquet(output_file)