diff --git a/data/gr-e-11.03.02.01.01-cc.csv b/data/gr-e-11.03.02.01.01-cc.csv index 47567275..0ba695de 100644 --- a/data/gr-e-11.03.02.01.01-cc.csv +++ b/data/gr-e-11.03.02.01.01-cc.csv @@ -42,4 +42,4 @@ 2020,4658335,88293,452186,195082,75659,771586,229421 2021,4709366,97805,466857,196530,77672,791323,244572 2022,4721280,105158,475714,196942,79691,789794,257753 -2023,4760948,114299,485303,197678,81241,805653, \ No newline at end of file +2023,4760948,114299,485303,197678,81241,805653, diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index 9282c0e7..48df4625 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -721,21 +721,18 @@ def build_transport_data(countries, population, idees): transport_data = pd.DataFrame(idees["passenger cars"]) -# https://www.bfs.admin.ch/bfs/en/home/statistics/mobility-transport/transport-infrastructure-vehicles/vehicles/road-vehicles-stock-level-motorisation.html + # https://www.bfs.admin.ch/bfs/en/home/statistics/mobility-transport/transport-infrastructure-vehicles/vehicles/road-vehicles-stock-level-motorisation.html if "CH" in countries: fn = snakemake.input.swiss_transport swiss_cars = pd.read_csv(fn, index_col=0).loc[1990:2021, ["passenger cars"]] swiss_cars.index = pd.MultiIndex.from_product( - [["CH"], swiss_cars.index], - names=["country", "year"] + [["CH"], swiss_cars.index], names=["country", "year"] ) transport_data = pd.concat([transport_data, swiss_cars]).sort_index() - transport_data.rename( - columns={"passenger cars": "number cars"}, inplace=True - ) + transport_data.rename(columns={"passenger cars": "number cars"}, inplace=True) missing = transport_data.index[transport_data["number cars"].isna()] if not missing.empty: