Merge branch 'develop' into geo_accessor

KS-HTK · Nov 13, 2024 · c892162 · c892162
2 parents f35b09c + d9ada10
commit c892162
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/pandapower/converter/cim/cim2pp/converter_classes/impedance/seriesCompensatorsCim16.py b/pandapower/converter/cim/cim2pp/converter_classes/impedance/seriesCompensatorsCim16.py
@@ -107,7 +107,7 @@ def _prepare_series_compensators_cim16(self) -> pd.DataFrame:
         ser_comp['gf_pu'] = 0.
         ser_comp['bf_pu'] = 0.
         ser_comp['gt_pu'] = 0.
-        ser_comp['bf_pu'] = 0.
+        ser_comp['bt_pu'] = 0.
         ser_comp['in_service'] = ser_comp.connected & ser_comp.connected2
         ser_comp = ser_comp.rename(columns={'rdfId_Terminal': sc['t_from'], 'rdfId_Terminal2': sc['t_to'],
                                             'rdfId': sc['o_id'], 'index_bus': 'from_bus', 'index_bus2': 'to_bus'})

diff --git a/pandapower/plotting/plotly/simple_plotly.py b/pandapower/plotting/plotly/simple_plotly.py
@@ -116,7 +116,7 @@ def simple_plotly(net, respect_switches=True, use_line_geo=None, on_map=False,
         **respect_switches** (bool, True) - Respect switches when artificial geodata is created
 
         **use_line_geo** (bool, True) - defines if lines patches are based on
-        net.line_geodata of the lines (True) or on net.bus_geodata of the connected buses (False)
+        net.line.geo of the lines (True) or on net.bus.geo of the connected buses (False)
 
         **on_map** (bool, False) - enables using mapbox plot in plotly.
         If provided geodata are not real geo-coordinates in lon/lat form, on_map will be set to False.

diff --git a/pandapower/plotting/plotly/vlevel_plotly.py b/pandapower/plotting/plotly/vlevel_plotly.py
@@ -35,8 +35,8 @@ def vlevel_plotly(net, respect_switches=True, use_line_geo=None, colors_dict=Non
     OPTIONAL:
         **respect_switches** (bool, True) - Respect switches when artificial geodata is created
 
-        **use_line_geo** (bool, True) - defines if lines patches are based on net.line_geodata
-        of the lines (True) or on net.bus_geodata of the connected buses (False)
+        **use_line_geo** (bool, True) - defines if lines patches are based on net.line.geo
+        of the lines (True) or on net.bus.geo of the connected buses (False)
 
         *colors_dict** (dict, None) - dictionary for customization of colors for each voltage level
         in the form: voltage : color

diff --git a/pandapower/toolbox/data_modification.py b/pandapower/toolbox/data_modification.py
@@ -376,7 +376,7 @@ def create_continuous_elements_index(net, start=0, add_df_to_reindex=set()):
 
         if et in net and isinstance(net[et], pd.DataFrame):
             if et in ["bus_geodata", "line_geodata"]:
-                logger.info(et + " don't need to bo included to 'add_df_to_reindex'. It is " +
+                logger.info(et + " don't need to be included to 'add_df_to_reindex'. It is " +
                             "already included by et=='" + et.split("_")[0] + "'.")
             else:
                 reindex_elements(net, et, new_index)