From b8e719b18416cbf459b8297e5774be7502f1755a Mon Sep 17 00:00:00 2001 From: Eddy-JV Date: Wed, 12 Jun 2024 08:51:51 +0200 Subject: [PATCH 1/2] Add Params to prepare_airports --- Snakefile | 2 ++ scripts/prepare_airports.py | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Snakefile b/Snakefile index 1e3a7423..102e29e5 100644 --- a/Snakefile +++ b/Snakefile @@ -124,6 +124,8 @@ rule prepare_ports: rule prepare_airports: + params: + airport_sizing_factor= config["sector"]["airport_sizing_factor"], output: ports="data/airports.csv", # TODO move from data to resources script: diff --git a/scripts/prepare_airports.py b/scripts/prepare_airports.py index d8ff462c..ae0b72ab 100644 --- a/scripts/prepare_airports.py +++ b/scripts/prepare_airports.py @@ -94,9 +94,7 @@ def download_airports(): df.insert(2, "airport_size_nr", 1) df.loc[df["type"].isin(["medium_airport"]), "airport_size_nr"] = 1 - df.loc[df["type"].isin(["large_airport"]), "airport_size_nr"] = snakemake.config[ - "sector" - ]["airport_sizing_factor"] + df.loc[df["type"].isin(["large_airport"]), "airport_size_nr"] = snakemake.params.airport_sizing_factor # Calculate the number of total airports size df1 = df.copy() From d5dae19d1cf6a328a423b52c9f04d2bf7bee6141 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 06:54:10 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Snakefile | 2 +- scripts/prepare_airports.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Snakefile b/Snakefile index 102e29e5..cd165810 100644 --- a/Snakefile +++ b/Snakefile @@ -125,7 +125,7 @@ rule prepare_ports: rule prepare_airports: params: - airport_sizing_factor= config["sector"]["airport_sizing_factor"], + airport_sizing_factor=config["sector"]["airport_sizing_factor"], output: ports="data/airports.csv", # TODO move from data to resources script: diff --git a/scripts/prepare_airports.py b/scripts/prepare_airports.py index ae0b72ab..7bfd24b5 100644 --- a/scripts/prepare_airports.py +++ b/scripts/prepare_airports.py @@ -94,7 +94,9 @@ def download_airports(): df.insert(2, "airport_size_nr", 1) df.loc[df["type"].isin(["medium_airport"]), "airport_size_nr"] = 1 - df.loc[df["type"].isin(["large_airport"]), "airport_size_nr"] = snakemake.params.airport_sizing_factor + df.loc[ + df["type"].isin(["large_airport"]), "airport_size_nr" + ] = snakemake.params.airport_sizing_factor # Calculate the number of total airports size df1 = df.copy()