Merge branch 'develop' into feature/make_available_required_std_type_…

…params

CHANGELOG.rst

@@ -5,28 +5,14 @@ Change Log
 -------------------------------
 - [ADDED] pandas series accessor for geo column
 - [FIXED] Increasing geojson precision as the default precision might cause problems with pandahub
+- [ADDED] converter for European EHV grid data from JAO, the "Single Allocation Platform (SAP) for all European Transmission System Operators (TSOs) that operate in accordance to EU legislation"
 - [ADDED] Add GeographicalRegion and SubGeographicalRegion names and ids to bus df in cim converter
 - [CHANGED] Capitalize first letter of columns busbar_id, busbar_name and substation_id in bus df for cim converter
 - [CHANGED] required standard type parameters are made available by function :code:`required_std_type_parameters()`
 - [FIXED] Do not modify pandas options when importing pandapower
 - [FIXED] fixed copy-paste error in contingency results "max_limit_nminus1" and "min_limit_nminus1"
 - [ADDED] improved lightsim2grid documentation including compatibitliy issues
 - [FIXED] cim2pp: set default xml encoding to None to avoid error after changing to lxml
-
-[2.14.11] - 2024-07-08
--------------------------------
-- [FIXED] Lightsim2grid version
-
-[2.14.10] - 2024-07-08
--------------------------------
-- [FIXED] geopandas version
-
-[2.14.9] - 2024-06-25
--------------------------------
-- [FIXED] scipy version
-
-[upcoming release] - 2024-..-..
--------------------------------
 - [FIXED] PandaModels OPF with 'bus_dc' key errors
 - [FIXED] julia tests
 - [FIXED] copy array element to standard python scalar
@@ -100,8 +86,20 @@ Change Log
 - [CHANGED] Trafo Controllers can now be added to elements that are out of service, changed self.nothing_to_do()
 - [ADDED] Discrete shunt controller for local voltage regulation with shunt steps
 - [ADDED] fix lengths missmatch of output if ignore_zero_length is False in plotting utility function coords_from_node_geodata() and rename ignore_zero_length by ignore_no_geo_diff
+- [ADDED] converter for European EHV grid data from JAO, the "Single Allocation Platform (SAP) for all European Transmission System Operators (TSOs) that operate in accordance to EU legislation"
 - [ADDED] cim2pp converter: Using lxml to parse XML files (better performance)
-- [ADDED] possibility to load JSON files with unknown object models and just store the models as dictionaries in the network
+
+[2.14.11] - 2024-07-08
+-------------------------------
+- [FIXED] Lightsim2grid version
+
+[2.14.10] - 2024-07-08
+-------------------------------
+- [FIXED] geopandas version
+
+[2.14.9] - 2024-06-25
+-------------------------------
+- [FIXED] scipy version
 
 [2.14.7] - 2024-06-14
 -------------------------------

doc/converter.rst

@@ -16,4 +16,5 @@ These tools are:
     converter/matpower
     converter/powerfactory
     converter/cgmes
+    converter/jao
 

doc/converter/jao.rst

@@ -0,0 +1,9 @@
+Documentation for the JAO Static Grid Model Converter Function
+==============================================================
+
+The ``from_jao`` function allows users to convert the Static Grid Model provided by JAO (Joint Allocation Office) into a pandapower network by reading and processing the provided Excel and HTML files.
+
+Function Overview
+-----------------
+
+.. autofunction:: pandapower.converter.from_jao

pandapower/converter/__init__.py

@@ -3,3 +3,4 @@
 from pandapower.converter.pandamodels import *
 from pandapower.converter.cim import *
 from pandapower.converter.powerfactory import *
+from pandapower.converter.jao import *

pandapower/converter/jao/__init__.py

@@ -0,0 +1 @@
+from .from_jao import from_jao