diff --git a/powerplantmatching/data.py b/powerplantmatching/data.py index 524c15b..7c24152 100644 --- a/powerplantmatching/data.py +++ b/powerplantmatching/data.py @@ -194,7 +194,9 @@ def OPSD( .assign( Name=lambda df: df.Name.str.replace("\x96", " "), # for geoparsing projectID=lambda s: "OEU-" + s.index.astype(str), - Fueltype=lambda d: d.Fueltype.fillna(d.Energy_Source_Level_1), + Fueltype=lambda d: d.Energy_Source_Level_3.where( + d.Energy_Source_Level_3.notna(), d.Fueltype + ).fillna(d.Energy_Source_Level_1), # We don't want to include this as this is overestimating CHP capacities # Set=lambda df: np.where(df.Set.isin(["yes", "Yes"]), "CHP", "PP"), ) diff --git a/powerplantmatching/package_data/manual_corrections.csv b/powerplantmatching/package_data/manual_corrections.csv index 52d0093..2524cf8 100644 --- a/powerplantmatching/package_data/manual_corrections.csv +++ b/powerplantmatching/package_data/manual_corrections.csv @@ -85,3 +85,4 @@ 83,48WSTN00000SROM0,ENTSOE,,,,,40.0,, 84,48WSTN00000STVEO,ENTSOE,,,,,0.0,, 85,GBR2001173,GPD,,,,,,Combustion Engine,PP +86,G100000500496,GEM,,,,,485.0,,