Merge pull request #168 from OSeMOSYS/plot-by-region-fix

Fix Plot By Region
OSeMOSYS · Mar 22, 2024 · 8831d70 · 8831d70
2 parents 39fdf23 + bd9b69f
commit 8831d70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/workflow/scripts/osemosys_global/visualisation/utils.py b/workflow/scripts/osemosys_global/visualisation/utils.py
@@ -56,7 +56,7 @@ def powerplant_filter(df: pd.DataFrame, country:str = None) -> pd.DataFrame:
 
     if country:
         filtered_df = filtered_df.loc[filtered_df['COUNTRY'] == country]
-        filtered_df['LABEL'] = filtered_df['COUNTRY'] + '-' + filtered_df['TYPE']
+        filtered_df['LABEL'] = filtered_df['TYPE']
     else:
         filtered_df['LABEL'] = filtered_df['TYPE']
 

diff --git a/workflow/scripts/osemosys_global/visualise.py b/workflow/scripts/osemosys_global/visualise.py
@@ -123,7 +123,7 @@ def plot_generation_annual(data: Dict[str,pd.DataFrame], save_dir: str, country:
             system level
     """
 
-    df = get_generation_annual_data(data, country=None)
+    df = get_generation_annual_data(data, country=country)
     plot_colors = get_color_codes()
 
     if not country: # System level titles