Merge pull request #971 from koen-vg/fix-sanitize-locations

Only sanitize locations when there are buses with a location
PyPSA · Mar 19, 2024 · db4219f · db4219f
2 parents 883a850 + e03fbf1
commit db4219f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py
@@ -184,12 +184,13 @@ def sanitize_carriers(n, config):
 
 
 def sanitize_locations(n):
-    n.buses["x"] = n.buses.x.where(n.buses.x != 0, n.buses.location.map(n.buses.x))
-    n.buses["y"] = n.buses.y.where(n.buses.y != 0, n.buses.location.map(n.buses.y))
-    n.buses["country"] = n.buses.country.where(
-        n.buses.country.ne("") & n.buses.country.notnull(),
-        n.buses.location.map(n.buses.country),
-    )
+    if "location" in n.buses.columns:
+        n.buses["x"] = n.buses.x.where(n.buses.x != 0, n.buses.location.map(n.buses.x))
+        n.buses["y"] = n.buses.y.where(n.buses.y != 0, n.buses.location.map(n.buses.y))
+        n.buses["country"] = n.buses.country.where(
+            n.buses.country.ne("") & n.buses.country.notnull(),
+            n.buses.location.map(n.buses.country),
+        )
 
 
 def add_co2_emissions(n, costs, carriers):