Merge branch 'dev' into features/#177-create-scenario-table

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

@@ -20,9 +20,12 @@
 import egon.data.importing.vg250 as import_vg250
 import egon.data.importing.zensus as import_zs
 import egon.data.processing.demandregio as process_dr
+import egon.data.processing.openstreetmap as process_osm
+import egon.data.processing.osmtgmod as osmtgmod
+import egon.data.processing.power_plants as power_plants
+import egon.data.processing.substation as substation
+import egon.data.processing.zensus as process_zs
 import egon.data.importing.scenarios as import_scenarios
-from egon.data import db
-
 
 with airflow.DAG(
     "egon-data-processing-pipeline",
@@ -312,7 +315,6 @@
         python_callable=osmtgmod.run_osmtgmod,
     )
 
-
     osmtgmod_pypsa = PythonOperator(
         task_id="osmtgmod_pypsa",
         python_callable=osmtgmod.osmtgmmod_to_pypsa,
@@ -360,5 +362,14 @@
     nep_insert_data >> power_plant_import
     retrieve_mastr_data >> power_plant_import
 
+    # Districute electrical CTS demands to zensus grid
 
+    elec_cts_demands_zensus = PythonOperator(
+        task_id="electrical-cts-demands-zensus",
+        python_callable=process_dr.distribute_cts_demands,
+    )
 
+    processed_dr_tables >> elec_cts_demands_zensus
+    heat_demand_import >> elec_cts_demands_zensus
+    demandregio_demand_cts_ind >> elec_cts_demands_zensus
+    map_zensus_vg250 >> elec_cts_demands_zensus