Merge branch 'dev' into features/#127-add-hydro-biomass-plants-eGon2035

CHANGELOG.rst

@@ -35,6 +35,8 @@ Added
   `#91 <https://github.com/openego/eGon-data/issues/91>`_
 * DemandRegio data import for annual electricity demands
   `#5 <https://github.com/openego/eGon-data/issues/5>`_
+* Download cleaned open-MaStR data from Zenodo
+  `#14 <https://github.com/openego/eGon-data/issues/14>`_
 
 Changed
 -------

src/egon/data/airflow/dags/pipeline.py

@@ -14,6 +14,8 @@
 import egon.data.importing.zensus as import_zs
 import egon.data.processing.power_plants as power_plants
 import egon.data.importing.nep_input_data as nep_input
+import egon.data.importing.etrago as etrago
+import egon.data.importing.mastr as mastr
 
 # Prepare connection to db for operators
 airflow_db_connection()
@@ -134,3 +136,18 @@
 
     setup >> create_tables >> nep_insert_data
     vg250_clean_and_prepare >> nep_insert_data
+
+
+    # setting etrago input tables
+    etrago_input_data = PythonOperator(
+        task_id = "setting-etrago-input-tables",
+        python_callable = etrago.create_tables
+    )
+    setup >> etrago_input_data
+
+    # Retrieve MaStR data
+    retrieve_mastr_data = PythonOperator(
+        task_id="retrieve_mastr_data",
+        python_callable=mastr.download_mastr_data
+    )
+    setup >> retrieve_mastr_data

src/egon/data/datasets.yml

@@ -84,3 +84,16 @@ scenario_input:
     paths:
       "capacities": "NEP2035_V2021_scnC2035.xlsx"
       "list_conv_pp": "Kraftwerksliste_NEP_2021_konv.csv"
+
+mastr:
+  technologies:
+    - "wind"
+    - "hydro"
+    - "solar"
+    - "biomass"
+    - "combustion"
+    - "nuclear"
+    - "gsgk"
+    - "storage"
+  file_basename: "bnetza_mastr"
+  deposit_id: 740153