Merge branch 'dev' into features/multiple_building_connections

oemof · Jan 24, 2025 · 7465b62 · 7465b62
2 parents 44bf390 + 62e6b61
commit 7465b62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/dhnx/optimization/precalc_hydraulic.py b/dhnx/optimization/precalc_hydraulic.py
@@ -354,7 +354,7 @@ def delta_p(v, d_i, k=0.1, T_medium=90, length=1,
 
     Returns
     -------
-    Pressure drop [bar] : numeric
+    Pressure drop [Pa] : numeric
 
     """
     k = k * 0.001

diff --git a/examples/optimisation/import_osm_invest/import_osm_invest.py b/examples/optimisation/import_osm_invest/import_osm_invest.py
@@ -70,17 +70,13 @@
 graph = ox.graph_from_polygon(polygon, network_type='drive_service')
 ox.plot_graph(graph)
 
-gdf_poly_houses = ox.geometries_from_polygon(polygon, tags=buildings)
-gdf_lines_streets = ox.geometries_from_polygon(polygon, tags=streets)
+gdf_poly_houses = ox.features_from_polygon(polygon, tags=buildings)
+gdf_lines_streets = ox.features_from_polygon(polygon, tags=streets)
 
 # Make sure that only polygon geometries are used
 gdf_poly_houses = gdf_poly_houses[gdf_poly_houses['geometry'].apply(
     lambda x: isinstance(x, geometry.Polygon))]
 
-# Remove nodes column (that make somehow trouble for exporting .geojson)
-gdf_poly_houses.drop(columns=['nodes'], inplace=True)
-gdf_lines_streets.drop(columns=['nodes'], inplace=True)
-
 # We need one (or more) buildings that we call "generators".
 # Choose one among the buildings at random and move it to a new GeoDataFrame
 np.random.seed(42)
-Original file line number
+Diff line change
@@ Expand Up / @@ -354,7 +354,7 @@ def delta_p(v, d_i, k=0.1, T_medium=90, length=1, @@
         Returns
         -------
-        Pressure drop [bar] : numeric
+        Pressure drop [Pa] : numeric
         """
         k = k * 0.001
@@ Expand Down @@