Merge pull request #341 from openego/fixes/#335-Adjustments-for-secon…

…d-version-status2019 Fixes/#335 adjustments for second version status2019
openego · Nov 21, 2024 · 865e847 · 865e847
2 parents bb84edc + c7e0819
commit 865e847
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/egon/data/airflow/dags/pipeline_status_quo.py b/src/egon/data/airflow/dags/pipeline_status_quo.py
@@ -335,7 +335,7 @@
 
     # Deal with electrical neighbours
     foreign_lines = ElectricalNeighbours(
-        dependencies=[prepare_pypsa_eur, tyndp_data]
+        dependencies=[prepare_pypsa_eur, tyndp_data, osmtgmod, fix_subnetworks]
     )
 
     # Import NEP (Netzentwicklungsplan) data

diff --git a/src/egon/data/datasets/electrical_neighbours.py b/src/egon/data/datasets/electrical_neighbours.py
@@ -538,6 +538,7 @@ def cross_border_lines(scenario, sources, targets, central_buses):
 
     new_lines = new_lines[new_lines.bus0 != new_lines.bus1]
 
+    new_lines["cables"] = new_lines["cables"].apply(int)
 
     # Insert lines to the database
     new_lines.to_postgis(

diff --git a/src/egon/data/datasets/storages/__init__.py b/src/egon/data/datasets/storages/__init__.py
@@ -309,7 +309,7 @@ def allocate_storage_units_sq(scn_name, storage_types):
     for storage_type in storage_types:
         # Read-in data from MaStR
         mastr_ph = pd.read_csv(
-            WORKING_DIR_MASTR_NEW / sources["mastr_storage"],
+            WORKING_DIR_MASTR_OLD / sources["mastr_storage"],
             delimiter=",",
             usecols=[
                 "Nettonennleistung",