feat: include pole mrid for converters

statnett · Jan 10, 2025 · 57e731a · 57e731a
1 parent 35e1e4e
commit 57e731a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/cimsparql/data_models.py b/src/cimsparql/data_models.py
@@ -163,6 +163,7 @@ class PhaseTapChangerSchema(CoercingSchema):
 class ConvertersSchema(NamedResourceSchema):
     alias: Series[str] = pa.Field(nullable=True)
     substation_mrid: Series[str] = pa.Field()
+    pole: Series[str] = pa.Field()
     status: Series[bool] = pa.Field()
     node: Series[str] = pa.Field()
     p: Series[float] = pa.Field()

diff --git a/src/cimsparql/sparql/converters.sparql b/src/cimsparql/sparql/converters.sparql
@@ -3,7 +3,7 @@ PREFIX cim:<${cim}>
 PREFIX xsd:<${xsd}>
 PREFIX SN:<${SN}>
 PREFIX ALG:<${ALG}>
-select ?mrid ?name ?alias ?p ?q ?substation_mrid ?status ?node ?connectivity_node ?controller ?controller_factor ?pole_loss ?loss0 ?loss1 ?loss2 ?vdcn ?un ?capacity
+select ?mrid ?name ?alias ?p ?q ?substation_mrid ?pole ?status ?node ?connectivity_node ?controller ?controller_factor ?pole_loss ?loss0 ?loss1 ?loss2 ?vdcn ?un ?capacity
 where {
   {
     select * where {
@@ -13,6 +13,7 @@ where {
         ?converter cim:IdentifiedObject.mRID ?mrid;
                    cim:IdentifiedObject.name ?name;
                    ALG:VoltageSourceConverter.DCPole|ALG:DCConverter.DCPole ?pole;
+                   ALG:VoltageSourceConverter.DCPole/cim:IdentifiedObject.mRID|ALG:DCConverter.DCPole/cim:IdentifiedObject.mRID ?pole;
                    ALG:VoltageSourceConverter.bridgeNominalVoltage|ALG:DCConverter.bridgeNominalVoltage ?ur;
                    ALG:VoltageSourceConverter.ratedIAC|ALG:DCConverter.currentRating ?ir.
 
@@ -53,15 +54,15 @@ where {
 	bind(coalesce(?_loss2, 0.0) as ?loss2)
 	bind(coalesce(?_vdcn, 0.0) as ?vdcn)
 	bind((xsd:float(?ir) * xsd:float(?ur) * xsd:float(coalesce(?bridges, 1))/1000) as ?capacity)
-	filter(?analysis_enabled)       
+	filter(?analysis_enabled)
       }
     }
   }
 
   # Extract active and reactive power for the converter
   ?converter cim:ACDCConverter.p ?p;
              cim:ACDCConverter.q ?q.
-  
+
   optional {?converter cim:ACDCConverter.poleLossP ?_pole_loss.}
   optional {?converter ^cim:SvStatus.ConductingEquipment/cim:SvStatus.inService ?in_service .}