@enervance/insight-cim-model 0.0.61 → 0.0.63

package/dist/model/wires/Junction.js

@@ -8,29 +8,51 @@ class Junction extends Connector_1.Connector {
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }
+    static sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+        PREFIX amp:	 		<http://amprion.net/CIM/Extensions#> 
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
+        ?name 
+        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+        
+        WHERE { 
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:Junction .
+                ?MRID cim:IdentifiedObject.name ?name .
+                OPTIONAL {?MRID cim:Equipment.EquipmentContainer ?ecUUID .}
+            }
+        }
+    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return Junction.sparqlQuery.replace('<http://default/>', graphURI);
         }
         return Junction.sparqlQuery;
     }
+    //hier mit Terminals weitermachen
     determineTopologicalNodes(connNodes) {
         super.determineTopologicalNodes(connNodes);
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
+        data?.results?.bindings?.forEach((value) => {
             const object = new Junction();
             object.resolveAttributesFusekiJSON(value);
             cimModel.addJunction(object);
         });
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_EQ_BD || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
-            xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -38,25 +60,4 @@ class Junction extends Connector_1.Connector {
     }
 }
 exports.Junction = Junction;
-Junction.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
-        ?name 
-        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-        
-        WHERE { 
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:Junction .
-                ?MRID cim:IdentifiedObject.name ?name .
-                OPTIONAL {?MRID cim:Equipment.EquipmentContainer ?ecUUID .}
-            }
-        }
-    `;
 //# sourceMappingURL=Junction.js.map

package/dist/model/wires/Junction.js.map

@@ -1 +1 @@
-{"version":3,"file":"Junction.js","sourceRoot":"","sources":["../../../src/model/wires/Junction.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qDAAgD;AAGhD,kEAAsE;AAEtE,MAAa,QAAS,SAAQ,qBAAS;IAGnC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAuBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAChC,CAAC;IAIM,yBAAyB,CAAC,SAA8B;QAC3D,KAAK,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;IAGM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC3D,YAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC9B,MAAM,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC1C,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC,EAAE;IACP,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACzG,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,sCAAqB,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SAC1B;IACL,CAAC;;AA7DL,4BA8DC;AAvDiB,oBAAW,GAAY;;;;;;;;;;;;;;;;;;;;KAoBpC,CAAA"}
+{"version":3,"file":"Junction.js","sourceRoot":"","sources":["../../../src/model/wires/Junction.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qDAAgD;AAGhD,kEAAsE;AAEtE,MAAa,QAAS,SAAQ,qBAAS;IAGnC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAEM,MAAM,CAAC,WAAW,GAAY;;;;;;;;;;;;;;;;;;;;KAoBpC,CAAA;IACM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,QAAQ,CAAC,WAAW,CAAC;IAChC,CAAC;IAGD,iCAAiC;IAC1B,yBAAyB,CAAC,SAA8B;QAC3D,KAAK,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;IAGM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACpE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5C,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC9B,MAAM,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC1C,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,iCAAiC;IAC1B,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACzG,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC1F,IAAA,sCAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,SAAS,CAAC,UAAU,EAAE,CAAC;SAC1B;IACL,CAAC;;AA7DL,4BA8DC"}

package/dist/model/wires/Line.d.ts

@@ -1,5 +1,5 @@
 import { EquipmentContainer } from '../core/EquipmentContainer';
-import { Model } from '../model/Model';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 import XMLWriter from 'xml-writer';
 import { SubGeographicalRegion } from '../core/SubGeographicalRegion';
 import { BaseVoltage } from '../core/BaseVoltage';
@@ -10,12 +10,13 @@ export declare class Line extends EquipmentContainer {
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): void;
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;

package/dist/model/wires/Line.js

@@ -7,10 +7,36 @@ const rdf_xml_1 = require("../../constants/rdf-xml");
 const ACLineSegment_1 = require("./ACLineSegment");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class Line extends EquipmentContainer_1.EquipmentContainer {
+    subGeographicalRegion;
+    regionUUID;
+    equipmentsUUIDS = [];
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
-        this.equipmentsUUIDS = [];
     }
+    static sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+        PREFIX amp:	 		<http://amprion.net/CIM/Extensions#> 
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (strafter(strafter(str(?lUUID), '#'), '_') AS ?uuid) ?name ?shortName ?description 
+        (strafter(strafter(str(?rUUID ), '#'), '_') AS ?regionUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+        
+                ?lUUID rdf:type cim:Line .
+                OPTIONAL {?lUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?lUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?lUUID cim:IdentifiedObject.description ?description .}
+                #Region
+                OPTIONAL {?lUUID cim:Line.Region ?rUUID .}
+            }
+        }
+    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return Line.sparqlQuery.replace('<http://default/>', graphURI);
@@ -18,8 +44,7 @@ class Line extends EquipmentContainer_1.EquipmentContainer {
         return Line.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
+        data?.results?.bindings?.forEach((value) => {
             const newClass = new Line();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addLine(newClass);
@@ -27,7 +52,7 @@ class Line extends EquipmentContainer_1.EquipmentContainer {
     }
     resolveAttributesFusekiJSON(value) {
         super.resolveAttributesFusekiJSON(value);
-        this.regionUUID = utils_1.getValue(value, 'regionUUID');
+        this.regionUUID = (0, utils_1.getValue)(value, 'regionUUID');
     }
     resolveParsedAssociations(cimModel) {
         super.resolveParsedAssociations(cimModel);
@@ -44,12 +69,13 @@ class Line extends EquipmentContainer_1.EquipmentContainer {
     toJSONAssociations() {
         super.toJSONAssociations();
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_EQ_BD || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
-            xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -64,7 +90,7 @@ class Line extends EquipmentContainer_1.EquipmentContainer {
             this.regionUUID = this.subGeographicalRegion ? this.subGeographicalRegion.mrid : this.regionUUID;
             if (this.subGeographicalRegion) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, `Line.Region`, rdf_xml_1.RDF_XML.CIM_NS_16);
-                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.regionUUID}`);
+                (0, xml_serializer_1.writeElementAttribute)(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.regionUUID}`);
                 xmlWriter.endElement();
             }
             else {
@@ -73,12 +99,11 @@ class Line extends EquipmentContainer_1.EquipmentContainer {
         }
     }
     getBaseVoltage() {
-        var _a, _b;
         if (this.equipments.length) {
             for (const equipment of this.equipments)
                 if (equipment instanceof ACLineSegment_1.ACLineSegment) {
                     const stk = equipment;
-                    if ((_b = (_a = stk.baseVoltage) === null || _a === void 0 ? void 0 : _a.nominalVoltage) === null || _b === void 0 ? void 0 : _b.value) {
+                    if (stk.baseVoltage?.nominalVoltage?.value) {
                         return stk.baseVoltage;
                     }
                 }
@@ -86,28 +111,4 @@ class Line extends EquipmentContainer_1.EquipmentContainer {
     }
 }
 exports.Line = Line;
-Line.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?lUUID), '#'), '_') AS ?uuid) ?name ?shortName ?description 
-        (strafter(strafter(str(?rUUID ), '#'), '_') AS ?regionUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-        
-                ?lUUID rdf:type cim:Line .
-                OPTIONAL {?lUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?lUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?lUUID cim:IdentifiedObject.description ?description .}
-                #Region
-                OPTIONAL {?lUUID cim:Line.Region ?rUUID .}
-            }
-        }
-    `;
 //# sourceMappingURL=Line.js.map

package/dist/model/wires/Line.js.map

@@ -1 +1 @@
-{"version":3,"file":"Line.js","sourceRoot":"","sources":["../../../src/model/wires/Line.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Line.js","sourceRoot":"","sources":["../../../src/model/wires/Line.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/LinearShuntCompensator.d.ts

@@ -7,6 +7,7 @@ export declare class LinearShuntCompensator extends ShuntCompensator {
     b0PerSection: number;
     g0PerSection: number;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;

package/dist/model/wires/LinearShuntCompensator.js

@@ -6,15 +6,20 @@ const utils_1 = require("../../converter/integral7/utils");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class LinearShuntCompensator extends ShuntCompensator_1.ShuntCompensator {
+    bPerSection; // Pflichtattr
+    gPerSection; // Pflichtattr
+    b0PerSection; // Pflichtattr
+    g0PerSection; // Pflichtattr
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter, profile) {
-        if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7 || profile === rdf_xml_1.RDF_XML.PROFILE_SSH) {
             const suffixID = this.getSuffixID(profile);
             const prefixUUID = this.getPrefixUUID(suffixID);
             xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
-            xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            (0, xml_serializer_1.writeElementAttribute)(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
             xmlWriter.endElement();
@@ -23,10 +28,10 @@ class LinearShuntCompensator extends ShuntCompensator_1.ShuntCompensator {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:LinearShuntCompensator.bPerSection`, this.bPerSection);
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:LinearShuntCompensator.gPerSection`, this.gPerSection);
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:LinearShuntCompensator.b0PerSection`, this.b0PerSection);
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:LinearShuntCompensator.g0PerSection`, this.g0PerSection);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:LinearShuntCompensator.bPerSection`, this.bPerSection);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:LinearShuntCompensator.gPerSection`, this.gPerSection);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:LinearShuntCompensator.b0PerSection`, this.b0PerSection);
+            (0, xml_serializer_1.writeElement)(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:LinearShuntCompensator.g0PerSection`, this.g0PerSection);
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
@@ -34,19 +39,19 @@ class LinearShuntCompensator extends ShuntCompensator_1.ShuntCompensator {
     }
     validateMandatoryAttributesCGMES(defaultValuesConfig) {
         let defaultValues = super.validateMandatoryAttributesCGMES(defaultValuesConfig);
-        if (!utils_1.isNumericI7(this.bPerSection)) {
+        if (!(0, utils_1.isNumericI7)(this.bPerSection)) {
             this.bPerSection = defaultValuesConfig.LinearShuntCompensator.bPerSection;
             defaultValues += 'bPerSection,';
         }
-        if (!utils_1.isNumericI7(this.gPerSection)) {
+        if (!(0, utils_1.isNumericI7)(this.gPerSection)) {
             this.gPerSection = defaultValuesConfig.LinearShuntCompensator.gPerSection;
             defaultValues += 'gPerSection,';
         }
-        if (!utils_1.isNumericI7(this.b0PerSection)) {
+        if (!(0, utils_1.isNumericI7)(this.b0PerSection)) {
             this.b0PerSection = defaultValuesConfig.LinearShuntCompensator.b0PerSection;
             defaultValues += 'b0PerSection,';
         }
-        if (!utils_1.isNumericI7(this.g0PerSection)) {
+        if (!(0, utils_1.isNumericI7)(this.g0PerSection)) {
             this.g0PerSection = defaultValuesConfig.LinearShuntCompensator.g0PerSection;
             defaultValues += 'g0PerSection';
         }
@@ -54,14 +59,12 @@ class LinearShuntCompensator extends ShuntCompensator_1.ShuntCompensator {
             this.description = `[${defaultValues}]`;
         return defaultValues;
     }
-}
-exports.LinearShuntCompensator = LinearShuntCompensator;
-LinearShuntCompensator.sparqlQuery = `
+    static sparqlQuery = `
         PREFIX cim:\t \t\t<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
         PREFIX enervance:\t<http://enervance.com/CIM/Extensions#> 
         PREFIX entsoe:\t \t<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
         PREFIX rdf:\t \t\t<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX amp:\t \t\t<http://amprion.net/2018/cim_extensions#> 
+        PREFIX amp:\t \t\t<http://amprion.net/CIM/Extensions#> 
         PREFIX apf:\t \t\t<http://jena.hpl.hp.com/ARQ/property#>
         PREFIX afn:\t \t\t<http://jena.apache.org/ARQ/function#>
         
@@ -93,4 +96,6 @@ LinearShuntCompensator.sparqlQuery = `
           }
         }
     `;
+}
+exports.LinearShuntCompensator = LinearShuntCompensator;
 //# sourceMappingURL=LinearShuntCompensator.js.map

package/dist/model/wires/LinearShuntCompensator.js.map

@@ -1 +1 @@
-{"version":3,"file":"LinearShuntCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/LinearShuntCompensator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LinearShuntCompensator.js","sourceRoot":"","sources":["../../../src/model/wires/LinearShuntCompensator.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/LoadBreakSwitch.d.ts

@@ -1,15 +1,15 @@
 import { ProtectedSwitch } from './ProtectedSwitch';
-import { Model } from '../model/Model';
+import { ModelContainer } from '../../model-container/model/ModelContainer';
 import { DiagramObject } from '../diagram/DiagramObject';
 import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos';
 export declare class LoadBreakSwitch extends ProtectedSwitch {
     constructor(uuid?: string, name?: string, shortName?: string, description?: string, normalOpen?: boolean, retained?: boolean);
     static sparqlQuery: string;
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
     static getQuerySPARQL(graphURI: string): string;
     toGeoJSON(geoJSON: any, profile: string, schemaSettings: ISchemaSettings, diagramObject?: DiagramObject): any;
-    protected resolveAttributesFusekiJSON(value: any): void;
-    resolveParsedAssociations(cimModel: Model): void;
+    resolveAttributesFusekiJSON(value: any): void;
+    resolveParsedAssociations(cimModel: ModelContainer): void;
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): void;

package/dist/model/wires/LoadBreakSwitch.js

@@ -6,9 +6,40 @@ class LoadBreakSwitch extends ProtectedSwitch_1.ProtectedSwitch {
     constructor(uuid, name, shortName, description, normalOpen, retained) {
         super(uuid, name, shortName, description, normalOpen, retained);
     }
+    static sparqlQuery = `
+        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
+        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
+        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+        PREFIX amp:	 		<http://amprion.net/CIM/Extensions#> 
+        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+
+        SELECT  (strafter(strafter(str(?dUUID), '#'), '_') AS ?uuid) 
+        (CONCAT(STRBEFORE(STR(?dUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName ?description ?open ?aggregate ?normalOpen ?retained 
+        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
+        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
+                        
+        WHERE {
+            GRAPH <http://default/>{
+                ?dUUID rdf:type cim:LoadBreakSwitch .
+                OPTIONAL{?dUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?dUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?dUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?dUUID cim:Equipment.aggregate ?aggregate .}
+                OPTIONAL{?dUUID cim:Switch.normalOpen ?normalOpen .}
+                OPTIONAL{?dUUID cim:Switch.retained ?retained .}
+                OPTIONAL{?dUUID cim:Switch.open ?open .}
+                OPTIONAL{?dUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+                OPTIONAL{?dUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
+            }
+        }
+        GROUP BY ?dUUID ?baseIRI ?name ?shortName ?description 
+         ?open ?aggregate ?normalOpen ?retained ?ecUUID
+    `;
     static resolveClassFusekiJSON(data, cimModel) {
-        var _a, _b;
-        (_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
+        data?.results?.bindings?.forEach((value) => {
             const newClass = new LoadBreakSwitch();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addLoadBreakSwitch(newClass);
@@ -35,6 +66,7 @@ class LoadBreakSwitch extends ProtectedSwitch_1.ProtectedSwitch {
                 diagramObjectUUID: diagramObject.mrid,
                 objectType: this.constructor.name,
                 radius: 2.5
+                // radius: +shapeInfo.radius
             };
         }
         return geoJSON;
@@ -59,36 +91,4 @@ class LoadBreakSwitch extends ProtectedSwitch_1.ProtectedSwitch {
     }
 }
 exports.LoadBreakSwitch = LoadBreakSwitch;
-LoadBreakSwitch.sparqlQuery = `
-        PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:	<http://enervance.com/CIM/Extensions#> 
-        PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
-        PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-        PREFIX amp:	 		<http://amprion.net/2018/cim_extensions#> 
-        PREFIX apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-
-        SELECT  (strafter(strafter(str(?dUUID), '#'), '_') AS ?uuid) 
-        (CONCAT(STRBEFORE(STR(?dUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName ?description ?open ?aggregate ?normalOpen ?retained 
-        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID) 
-        (group_concat(STRAFTER(str(?aecUUIDs), '#_');separator=',') as ?additionalEquipmentContainerUUIDs)
-                        
-        WHERE {
-            GRAPH <http://default/>{
-                ?dUUID rdf:type cim:LoadBreakSwitch .
-                OPTIONAL{?dUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?dUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?dUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?dUUID cim:Equipment.aggregate ?aggregate .}
-                OPTIONAL{?dUUID cim:Switch.normalOpen ?normalOpen .}
-                OPTIONAL{?dUUID cim:Switch.retained ?retained .}
-                OPTIONAL{?dUUID cim:Switch.open ?open .}
-                OPTIONAL{?dUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-                OPTIONAL{?dUUID cim:Equipment.AdditionalEquipmentContainer ?aecUUIDs .}
-            }
-        }
-        GROUP BY ?dUUID ?baseIRI ?name ?shortName ?description 
-         ?open ?aggregate ?normalOpen ?retained ?ecUUID
-    `;
 //# sourceMappingURL=LoadBreakSwitch.js.map

package/dist/model/wires/LoadBreakSwitch.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoadBreakSwitch.js","sourceRoot":"","sources":["../../../src/model/wires/LoadBreakSwitch.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAMlD,MAAa,eAAgB,SAAQ,iCAAe;IAElD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,UAAoB,EAAE,QAAkB;QAC1H,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IAmCM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAe;;QAC7D,YAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;YACvC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,EAAE;IACL,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,eAAe,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,SAAS,CAAC,OAAY,EAAE,OAAe,EAAE,cAA+B,EAAE,aAA6B;QAC5G,MAAM,WAAW,GAAa,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAC7E,MAAM,SAAS,GAAqB,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC/E,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpB,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;YAEjE,OAAO,CAAC,UAAU,CAAC,GAAG;gBACpB,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;aACpB,CAAA;YAED,OAAO,CAAC,YAAY,CAAC,GAAG;gBACtB,iBAAiB,EAAE,aAAa,CAAC,IAAI;gBACrC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;gBACjC,MAAM,EAAE,GAAG;aAEZ,CAAA;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;;AAnGH,0CAqGC;AA/Fe,2BAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BjC,CAAA"}
+{"version":3,"file":"LoadBreakSwitch.js","sourceRoot":"","sources":["../../../src/model/wires/LoadBreakSwitch.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAMlD,MAAa,eAAgB,SAAQ,iCAAe;IAElD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,UAAoB,EAAE,QAAkB;QAC1H,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BjC,CAAA;IAEI,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;YACvC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,eAAe,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,SAAS,CAAC,OAAY,EAAE,OAAe,EAAE,cAA+B,EAAE,aAA6B;QAC5G,MAAM,WAAW,GAAa,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAC7E,MAAM,SAAS,GAAqB,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC/E,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpB,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;YAEjE,OAAO,CAAC,UAAU,CAAC,GAAG;gBACpB,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;aACpB,CAAA;YAED,OAAO,CAAC,YAAY,CAAC,GAAG;gBACtB,iBAAiB,EAAE,aAAa,CAAC,IAAI;gBACrC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;gBACjC,MAAM,EAAE,GAAG;gBACX,4BAA4B;aAC7B,CAAA;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM;QACX,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;;AAnGH,0CAqGC"}

package/dist/model/wires/PetersenCoil.d.ts

@@ -1,6 +1,6 @@
 import { EarthFaultCompensator } from "./EarthFaultCompensator";
 import { PetersenCoilModeKind } from "./PetersenCoilModeKind";
-import { Model } from "../..";
+import { ModelContainer } from "../..";
 import { IDefaultValuesConfig } from '../../converter/integral7/interface-i7/IDefaultValuesConfig';
 import XMLWriter from 'xml-writer';
 export declare class PetersenCoil extends EarthFaultCompensator {
@@ -12,11 +12,12 @@ export declare class PetersenCoil extends EarthFaultCompensator {
     xGroundMin: number;
     xGroundNominal: number;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
-    static resolveClassFusekiJSON(data: any, cimModel: Model): void;
-    protected resolveAttributesFusekiJSON(value: any): void;
+    static resolveClassFusekiJSON(data: any, cimModel: ModelContainer): void;
+    resolveAttributesFusekiJSON(value: any): void;
     toJSON(): any;
     toJSONAttributes(): void;
     toJSONAssociations(): void;
+    /** CIM RDF/XML Serialisierung */
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     static getQuerySPARQL(graphURI: string): string;