@enervance/insight-cim-model 0.0.64 → 0.0.65

package/dist/model/common/Organisation.js

@@ -3,19 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Organisation = void 0;
 const IdentifiedObject_1 = require("../core/IdentifiedObject");
 class Organisation extends IdentifiedObject_1.IdentifiedObject {
-    roles = new Map();
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description, baseIRI);
+        this.roles = new Map();
     }
     addRole(role) {
-        if (this.roles.has(role?.mrid)) {
-            console.log(`OrganisationRole ${role?.mrid} für ${this.name} existiert bereits.`);
+        if (this.roles.has(role === null || role === void 0 ? void 0 : role.mrid)) {
+            console.log(`OrganisationRole ${role === null || role === void 0 ? void 0 : role.mrid} für ${this.name} existiert bereits.`);
         }
         else {
             this.roles.set(role.mrid, role);
         }
     }
-    static sparqlQuery = `
+    static getQuerySPARQL(graphURI) {
+        if (graphURI.length > 0) {
+            return Organisation.sparqlQuery.replace("<http://default/>", graphURI);
+        }
+        else {
+            return Organisation.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) => {
+            const orga = new Organisation();
+            orga.resolveAttributesFusekiJSON(value);
+            cimModel.addOrganisation(orga);
+        });
+    }
+}
+exports.Organisation = Organisation;
+Organisation.sparqlQuery = `
         PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
         PREFIX entsoe:	 	<http://entsoe.eu/CIM/SchemaExtension/3/1#> 
         PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
@@ -37,21 +55,4 @@ class Organisation extends IdentifiedObject_1.IdentifiedObject {
             }
         }
     `;
-    static getQuerySPARQL(graphURI) {
-        if (graphURI.length > 0) {
-            return Organisation.sparqlQuery.replace("<http://default/>", graphURI);
-        }
-        else {
-            return Organisation.sparqlQuery;
-        }
-    }
-    static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
-            const orga = new Organisation();
-            orga.resolveAttributesFusekiJSON(value);
-            cimModel.addOrganisation(orga);
-        });
-    }
-}
-exports.Organisation = Organisation;
 //# sourceMappingURL=Organisation.js.map

package/dist/model/common/Organisation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Organisation.js","sourceRoot":"","sources":["../../../src/model/common/Organisation.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAI5D,MAAa,YAAa,SAAQ,mCAAgB;IAEhD,KAAK,GAAkC,IAAI,GAAG,EAAE,CAAC;IAEjD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,OAAO,CAAC,IAAsB;QACnC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,IAAI,QAAQ,IAAI,CAAC,IAAI,qBAAqB,CAAC,CAAC;SACnF;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACjC;IACH,CAAC;IAEM,MAAM,CAAC,WAAW,GAAW;;;;;;;;;;;;;;;;;;;;;KAqBjC,CAAA;IAEI,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACxE;aAAM;YACL,OAAO,YAAY,CAAC,WAAW,CAAC;SACjC;IACH,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;QACtE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACxC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;;AArDH,oCAsDC"}
+{"version":3,"file":"Organisation.js","sourceRoot":"","sources":["../../../src/model/common/Organisation.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAI5D,MAAa,YAAa,SAAQ,mCAAgB;IAIhD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAHrD,UAAK,GAAkC,IAAI,GAAG,EAAE,CAAC;IAIjD,CAAC;IAEM,OAAO,CAAC,IAAsB;QACnC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,QAAQ,IAAI,CAAC,IAAI,qBAAqB,CAAC,CAAC;SACnF;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACjC;IACH,CAAC;IAyBM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SACxE;aAAM;YACL,OAAO,YAAY,CAAC,WAAW,CAAC;SACjC;IACH,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAC,IAAS,EAAE,QAAwB;;QACtE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,0CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC9C,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACxC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;;AArDH,oCAsDC;AAtCe,wBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;KAqBjC,CAAA"}

package/dist/model/common/OrganisationRole.js

@@ -4,8 +4,6 @@ exports.OrganisationRole = void 0;
 const __1 = require("../..");
 const utils_1 = require("../../util/utils");
 class OrganisationRole extends __1.IdentifiedObject {
-    organisation;
-    organisationUUID;
     constructor(mrid, name, shortName, description) {
         super(mrid, name, shortName, description);
     }
@@ -14,8 +12,9 @@ class OrganisationRole extends __1.IdentifiedObject {
         this.organisationUUID = (0, utils_1.getValue)(value, 'organisationUUID');
     }
     resolveParsedAssociations(cimModel) {
+        var _a;
         this.organisation = cimModel.getOrganisation(this.organisationUUID);
-        this.organisation?.addRole(this);
+        (_a = this.organisation) === null || _a === void 0 ? void 0 : _a.addRole(this);
     }
 }
 exports.OrganisationRole = OrganisationRole;

package/dist/model/common/OrganisationRole.js.map

@@ -1 +1 @@
-{"version":3,"file":"OrganisationRole.js","sourceRoot":"","sources":["../../../src/model/common/OrganisationRole.ts"],"names":[],"mappings":";;;AAAA,6BAAmE;AAEnE,4CAA4C;AAE5C,MAAa,gBAAiB,SAAQ,oBAAgB;IAElD,YAAY,CAAe;IAC3B,gBAAgB,CAAS;IAEzB,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACxF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAChE,CAAC;IACM,yBAAyB,CAAC,QAAwB;QACrD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpE,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;CACJ;AAjBD,4CAiBC"}
+{"version":3,"file":"OrganisationRole.js","sourceRoot":"","sources":["../../../src/model/common/OrganisationRole.ts"],"names":[],"mappings":";;;AAAA,6BAAmE;AAEnE,4CAA4C;AAE5C,MAAa,gBAAiB,SAAQ,oBAAgB;IAKlD,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QACxF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAEM,2BAA2B,CAAC,KAAU;QACzC,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAChE,CAAC;IACM,yBAAyB,CAAC,QAAwB;;QACrD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpE,MAAA,IAAI,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;CACJ;AAjBD,4CAiBC"}

package/dist/model/common/PositionPoint.js

@@ -5,41 +5,10 @@ const __1 = require("../..");
 const utils_1 = require("../../util/utils");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class PositionPoint extends __1.IdentifiedObject {
-    location;
-    locationUUID;
-    sequenceNumber;
-    xPosition;
-    yPosition;
-    zPosition;
     constructor(mrid, name, shortName, description, baseIRI) {
         super(mrid, name, shortName, description);
         this.baseIRI = baseIRI;
     }
-    /** ------------------ Fuseki Schnittstelle ------------------*/
-    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) 
-                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
-                        ?sequenceNumber ?xPosition ?yPosition
-                        (strafter(strafter(str(?locUUID), '#'), '_') AS ?locationUUID) 
-                                
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:PositionPoint .
-                        OPTIONAL {?MRID cim:PositionPoint.sequenceNumber ?sequenceNumber .}
-                        OPTIONAL {?MRID cim:PositionPoint.xPosition ?xPosition .}
-                        OPTIONAL {?MRID cim:PositionPoint.yPosition ?yPosition .}
-                        OPTIONAL {?MRID cim:PositionPoint.Location ?locUUID .}
-                    }
-                }
-                `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return PositionPoint.sparqlQuery.replace('<http://default/>', graphURI);
@@ -47,7 +16,8 @@ class PositionPoint extends __1.IdentifiedObject {
         return PositionPoint.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        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) => {
             const positionPoint = new PositionPoint();
             positionPoint.resolveAttributesFusekiJSON(value);
             cimModel.addLPositionPoint(positionPoint);
@@ -146,4 +116,29 @@ class PositionPoint extends __1.IdentifiedObject {
     }
 }
 exports.PositionPoint = PositionPoint;
+/** ------------------ Fuseki Schnittstelle ------------------*/
+PositionPoint.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) 
+                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
+                        ?sequenceNumber ?xPosition ?yPosition
+                        (strafter(strafter(str(?locUUID), '#'), '_') AS ?locationUUID) 
+                                
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type cim:PositionPoint .
+                        OPTIONAL {?MRID cim:PositionPoint.sequenceNumber ?sequenceNumber .}
+                        OPTIONAL {?MRID cim:PositionPoint.xPosition ?xPosition .}
+                        OPTIONAL {?MRID cim:PositionPoint.yPosition ?yPosition .}
+                        OPTIONAL {?MRID cim:PositionPoint.Location ?locUUID .}
+                    }
+                }
+                `;
 //# sourceMappingURL=PositionPoint.js.map

package/dist/model/common/PositionPoint.js.map

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

package/dist/model/common/Status.js

@@ -3,10 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Status = void 0;
 const utils_1 = require("../../util/utils");
 class Status {
-    value;
-    reason;
-    remark;
-    dateTime;
     setStatus(value) {
         this.value = value;
         return ` [ 

package/dist/model/common/Status.js.map

@@ -1 +1 @@
-{"version":3,"file":"Status.js","sourceRoot":"","sources":["../../../src/model/common/Status.ts"],"names":[],"mappings":";;;AAAA,4CAA0C;AAE1C,MAAa,MAAM;IAEjB,KAAK,CAAS;IACd,MAAM,CAAS;IACf,MAAM,CAAS;IACf,QAAQ,CAAS;IAEjB,SAAS,CAAC,KAAa;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO;;mCAEwB,IAAI,CAAC,KAAK;eAC9B,CAAC;IACd,CAAC;IAEM,sBAAsB,CAAC,KAAU;QACtC,IAAI,CAAC,KAAK,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;CACF;AAlBD,wBAkBC"}
+{"version":3,"file":"Status.js","sourceRoot":"","sources":["../../../src/model/common/Status.ts"],"names":[],"mappings":";;;AAAA,4CAA0C;AAE1C,MAAa,MAAM;IAOjB,SAAS,CAAC,KAAa;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO;;mCAEwB,IAAI,CAAC,KAAK;eAC9B,CAAC;IACd,CAAC;IAEM,sBAAsB,CAAC,KAAU;QACtC,IAAI,CAAC,KAAK,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;CACF;AAlBD,wBAkBC"}

package/dist/model/core/ACDCTerminal.js

@@ -8,11 +8,9 @@ const IdentifiedObject_1 = require("./IdentifiedObject");
 const utils_2 = require("../../converter/integral7/utils");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class ACDCTerminal extends IdentifiedObject_1.IdentifiedObject {
-    sequenceNumber;
-    connected;
     constructor(mrid, name, shortName, description, sequenceNumber) {
         super(mrid, name, shortName, description);
-        this.sequenceNumber = sequenceNumber ?? 0;
+        this.sequenceNumber = sequenceNumber !== null && sequenceNumber !== void 0 ? sequenceNumber : 0;
         this.prop2namespacePrefix.set('sequenceNumber', 'cim'); // zur Generierung der Insert-Statements
         this.prop2Class.set('sequenceNumber', 'ACDCTerminal');
         this.prop2Datatype.set('sequenceNumber', 'number');

package/dist/model/core/ACDCTerminal.js.map

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

package/dist/model/core/BaseVoltage.js

@@ -6,10 +6,9 @@ const utils_1 = require("../../util/utils");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class BaseVoltage extends IdentifiedObject_1.IdentifiedObject {
-    nominalVoltage;
-    nominalVoltageValue = 0;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
+        this.nominalVoltageValue = 0;
     }
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
@@ -17,31 +16,9 @@ class BaseVoltage extends IdentifiedObject_1.IdentifiedObject {
         }
         return BaseVoltage.sparqlQuery;
     }
-    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(?bvUUID), "#"), "_") AS ?uuid) 
-                (CONCAT(STRBEFORE(str(?bvUUID), '#_'), '#_') AS ?baseIRI) 
-                ?name ?shortName ?description ?nominalVoltage
-                
-                WHERE { 
-                    GRAPH <http://default/>{
-                        ?bvUUID rdf:type cim:BaseVoltage .
-                        OPTIONAL{?bvUUID cim:IdentifiedObject.name ?name .}
-                        OPTIONAL{?bvUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                        OPTIONAL{?bvUUID cim:IdentifiedObject.description ?description .}
-                        OPTIONAL{?bvUUID cim:BaseVoltage.nominalVoltage ?nominalVoltage .}
-                    }
-                }
-    `;
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        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) => {
             const baseVoltage = new BaseVoltage();
             baseVoltage.resolveAttributesFusekiJSON(value);
             cimModel.addBaseVoltage(baseVoltage);
@@ -110,4 +87,27 @@ class BaseVoltage extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.BaseVoltage = BaseVoltage;
+BaseVoltage.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(?bvUUID), "#"), "_") AS ?uuid) 
+                (CONCAT(STRBEFORE(str(?bvUUID), '#_'), '#_') AS ?baseIRI) 
+                ?name ?shortName ?description ?nominalVoltage
+                
+                WHERE { 
+                    GRAPH <http://default/>{
+                        ?bvUUID rdf:type cim:BaseVoltage .
+                        OPTIONAL{?bvUUID cim:IdentifiedObject.name ?name .}
+                        OPTIONAL{?bvUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                        OPTIONAL{?bvUUID cim:IdentifiedObject.description ?description .}
+                        OPTIONAL{?bvUUID cim:BaseVoltage.nominalVoltage ?nominalVoltage .}
+                    }
+                }
+    `;
 //# sourceMappingURL=BaseVoltage.js.map

package/dist/model/core/BaseVoltage.js.map

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

package/dist/model/core/Bay.js

@@ -6,34 +6,9 @@ const utils_1 = require("../../util/utils");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class Bay extends EquipmentContainer_1.EquipmentContainer {
-    voltageLevel;
-    voltageLevelUUID;
     constructor(uuid, name, shortName, description, baseIRI) {
         super(uuid, name, shortName, description, baseIRI);
     }
-    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 apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (strafter(strafter(str(?bayUUID), '#'), '_') AS ?uuid) 
-                 (CONCAT(STRBEFORE(str(?bayUUID), '#_'), '#_') AS ?baseIRI) 
-                 ?name ?shortName ?description 
-                 (strafter(strafter(str(?vlUUID), '#'), '_') AS ?voltageLevelUUID)
-        WHERE { 
-            GRAPH <http://default/>{
-                ?bayUUID rdf:type cim:Bay .
-                OPTIONAL {?bayUUID cim:IdentifiedObject.name ?name . }
-                OPTIONAL {?bayUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?bayUUID cim:IdentifiedObject.description ?description .}
-  
-                OPTIONAL {?bayUUID cim:Bay.VoltageLevel ?vlUUID}
-            }
-        }
-    `;
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {
             return Bay.sparqlQuery.replace('<http://default/>', graphURI);
@@ -41,7 +16,8 @@ class Bay extends EquipmentContainer_1.EquipmentContainer {
         return Bay.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        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) => {
             const bay = new Bay();
             bay.resolveAttributesFusekiJSON(value);
             cimModel.addBay(bay);
@@ -80,8 +56,9 @@ class Bay extends EquipmentContainer_1.EquipmentContainer {
         return 0;
     }
     getBaseVoltage() {
+        var _a;
         if (this.voltageLevel) {
-            return this.voltageLevel?.baseVoltage;
+            return (_a = this.voltageLevel) === null || _a === void 0 ? void 0 : _a.baseVoltage;
         }
     }
     getVoltageLevel() {
@@ -162,4 +139,27 @@ class Bay extends EquipmentContainer_1.EquipmentContainer {
     }
 }
 exports.Bay = Bay;
+Bay.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 apf:	 		<http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		<http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (strafter(strafter(str(?bayUUID), '#'), '_') AS ?uuid) 
+                 (CONCAT(STRBEFORE(str(?bayUUID), '#_'), '#_') AS ?baseIRI) 
+                 ?name ?shortName ?description 
+                 (strafter(strafter(str(?vlUUID), '#'), '_') AS ?voltageLevelUUID)
+        WHERE { 
+            GRAPH <http://default/>{
+                ?bayUUID rdf:type cim:Bay .
+                OPTIONAL {?bayUUID cim:IdentifiedObject.name ?name . }
+                OPTIONAL {?bayUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?bayUUID cim:IdentifiedObject.description ?description .}
+  
+                OPTIONAL {?bayUUID cim:Bay.VoltageLevel ?vlUUID}
+            }
+        }
+    `;
 //# sourceMappingURL=Bay.js.map

package/dist/model/core/Bay.js.map

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

package/dist/model/core/ConductingEquipment.js

@@ -6,17 +6,10 @@ const utils_1 = require("../../util/utils");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class ConductingEquipment extends Equipment_1.Equipment {
-    terminals;
-    terminalsUUIDs = [];
-    baseVoltage;
-    baseVoltageUUID;
-    svStatus;
-    svStatusUUID;
-    /** Abweichend vom CIM Model: statt 0..1, 0..n Kardinalität!*/
-    outages;
     //constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string, aggregate?: boolean) {
     constructor(uuid, name, shortName, description, baseIRI) {
         super(uuid, name, shortName, description, baseIRI);
+        this.terminalsUUIDs = [];
         this.terminals = new Map();
         this.outages = new Map();
     }

package/dist/model/core/ConductingEquipment.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConductingEquipment.js","sourceRoot":"","sources":["../../../src/model/core/ConductingEquipment.ts"],"names":[],"mappings":";;;AAGA,2CAAsC;AACtC,4CAAqD;AACrD,qDAAgD;AAQhD,kEAAsE;AAEtE,MAAa,mBAAoB,SAAQ,qBAAS;IAEhD,SAAS,CAAyB;IAClC,cAAc,GAAa,EAAE,CAAC;IAE9B,WAAW,CAA0B;IACrC,eAAe,CAAqB;IAEpC,QAAQ,CAAW;IACnB,YAAY,CAAqB;IAEjC,8DAA8D;IAC9D,OAAO,CAAuB;IAEhC,8HAA8H;IAC5H,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB;QAClG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;IAC3B,CAAC;IAEM,WAAW,CAAC,QAAkB;QACnC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;IAEM,WAAW,CAAC,IAAY;QAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAA,gBAAQ,EAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAC1D,mDAAmD;IACrD,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;IAC/E,CAAC;IAEM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,wEAAwE;QACxE,mFAAmF;IACrF,CAAC;IAEM,oBAAoB,CAAC,eAAuB;QACjD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,qBAAqB;YACrB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE;gBAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACvB,KAAK,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;aAC7C;SACF;IACH,CAAC;IAEM,kBAAkB,CAAC,eAAsB;QAC9C,qBAAqB;QACrB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE;YAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACvB,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,0FAA0F;IACnF,mBAAmB,CAAC,cAAmC;QAC5D,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;YACvC,qBAAqB;YACrB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE;gBAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACvB,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;aAC3C;SACF;IACH,CAAC;IAED,8FAA8F;IACvF,+BAA+B,CAAC,mBAAwC,EAAE,uBAA8C;QAC7H,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAA,iBAAS,EAAC,IAAI,EAAE,uBAAuB,CAAC,EAAE;YACpE;;;qBAGS;YACH,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;YAC5C,qBAAqB;YACrB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE;gBAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACvB,KAAK,CAAC,+BAA+B,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC;aACrF;SACF;IACH,CAAC;IAEM,yBAAyB,CAAC,SAA8B;QAC7D,qBAAqB;QACrB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE;YAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACvB,KAAK,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;SAC5C;IACH,CAAC;IAED,yDAAyD;IAClD,iBAAiB;QACtB,MAAM,WAAW,GAAwB,EAAE,CAAC;QAC5C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE;YAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC;YACtC,IAAI,IAAI,EAAE;gBACR,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aACvB;SACF;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,uEAAuE;IAChE,WAAW;QAChB,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE;YAC3C,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,SAAS,EAAE;gBAClC,SAAS,GAAG,KAAK,CAAC;aACnB;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,eAAe;QACpB,IAAI,KAAK,GAAW,CAAC,CAAC;QACtB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE;YAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACvB,IAAI,KAAK,IAAI,KAAK,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBAChE,IAAI,QAAQ,GAAG,KAAK,EAAE;oBACpB,KAAK,GAAG,QAAQ,CAAC;iBAClB;aACF;SACF;QACD,wDAAwD;QACxD,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,KAAK,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;SACjC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,QAAQ;QACb,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE;YAC3C,IAAI,KAAK,CAAC,MAAM;gBAAE,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;SACjD;IACH,CAAC;IAED,EAAE;IACK,YAAY;QACjB,OAAO,KAAK,CAAC;IACf,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;YACvF,IAAI,IAAI,CAAC,eAAe,EAAE;gBACxB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,iCAAiC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACtG,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;gBACzG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;SACF;IACH,CAAC;IAED,SAAS,CAAC,MAAe;QACvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;CACF;AA3KD,kDA2KC"}
+{"version":3,"file":"ConductingEquipment.js","sourceRoot":"","sources":["../../../src/model/core/ConductingEquipment.ts"],"names":[],"mappings":"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"}

package/dist/model/core/ConnectivityNode.js

@@ -11,43 +11,6 @@ const rdf_xml_1 = require("../../constants/rdf-xml");
 const __1 = require("../..");
 const xml_serializer_2 = require("../../util/xml/xml.serializer");
 class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
-    /* Bay, VoltageLevel, Substation, Line ...*/
-    connectivityNodeContainer;
-    connectivityNodeContainerUUID;
-    terminals;
-    /** ENTSO-E EQ Boundary Profile */
-    boundaryPoint;
-    fromEndName;
-    fromEndNameTso;
-    fromEndIsoCode;
-    toEndName;
-    toEndNameTso;
-    toEndIsoCode;
-    static sparqlQuery = `
-        PREFIX cim:	 		            <http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-        PREFIX enervance:           <http://enervance.com/CIM/Extensions#> 
-        PREFIX westnetzneplan:	    <http://westnetzneplan.de/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/Extensions#> 
-        PREFIX apf:	 		            <http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		            <http://jena.apache.org/ARQ/function#>
-        
-        SELECT  (STRAFTER(str(?MRID), '#_') AS ?uuid)  
-                (CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI) 
-                ?name ?shortName ?description 
-                (STRAFTER(str(?cncUUID), '#_') AS ?connectivityNodeContainerUUID)
-        
-        WHERE { 
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:ConnectivityNode .
-                OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?MRID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
-                OPTIONAL {?MRID cim:ConnectivityNode.ConnectivityNodeContainer ?cncUUID .}
-            }
-        }
-    `;
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
         this.terminals = new Map();
@@ -71,15 +34,16 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
         return;
     }
     getBaseVoltageAsNumber() {
+        var _a, _b, _c, _d;
         try {
             if (this.connectivityNodeContainer instanceof VoltageLevel_1.VoltageLevel) {
                 return this.connectivityNodeContainer.baseVoltage.nominalVoltage.value;
             }
             else if (this.connectivityNodeContainer instanceof Bay_1.Bay) {
-                return this.connectivityNodeContainer.getBaseVoltage()?.nominalVoltage?.value;
+                return (_b = (_a = this.connectivityNodeContainer.getBaseVoltage()) === null || _a === void 0 ? void 0 : _a.nominalVoltage) === null || _b === void 0 ? void 0 : _b.value;
             }
             else if (this.connectivityNodeContainer instanceof __1.Line) {
-                return this.connectivityNodeContainer.getBaseVoltage()?.nominalVoltage?.value;
+                return (_d = (_c = this.connectivityNodeContainer.getBaseVoltage()) === null || _c === void 0 ? void 0 : _c.nominalVoltage) === null || _d === void 0 ? void 0 : _d.value;
             }
         }
         catch (e) {
@@ -100,7 +64,8 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
         return ConnectivityNode.sparqlQuery;
     }
     static resolveClassFusekiJSON(data, cimModel) {
-        data?.results?.bindings?.forEach((value) => {
+        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) => {
             const newClass = new ConnectivityNode();
             newClass.resolveAttributesFusekiJSON(value);
             cimModel.addConnectivityNode(newClass);
@@ -283,6 +248,7 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
         }
     }
     toGeoJSON(geoJSON, profile, schemaSettings, diagramObject) {
+        var _a;
         const coordinates = diagramObject.computeRectBounds(diagramObject);
         const shapeInfos = schemaSettings.getRectangleShapeInfo(profile);
         let x = coordinates[0];
@@ -293,7 +259,7 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
         let height = coordinates[3];
         /* Shape besteht nur aus einer Koordinate */
         if (shapeInfos && width === 1 && height === 1) {
-            width = +shapeInfos.width ?? 0;
+            width = (_a = +shapeInfos.width) !== null && _a !== void 0 ? _a : 0;
             height = +shapeInfos.height;
             offsetX = +width / 2;
             offsetY = +height / 2;
@@ -442,4 +408,29 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.ConnectivityNode = ConnectivityNode;
+ConnectivityNode.sparqlQuery = `
+        PREFIX cim:	 		            <http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+        PREFIX enervance:           <http://enervance.com/CIM/Extensions#> 
+        PREFIX westnetzneplan:	    <http://westnetzneplan.de/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/Extensions#> 
+        PREFIX apf:	 		            <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		            <http://jena.apache.org/ARQ/function#>
+        
+        SELECT  (STRAFTER(str(?MRID), '#_') AS ?uuid)  
+                (CONCAT(STRBEFORE(str(?MRID), '#_'), '#_') AS ?baseIRI) 
+                ?name ?shortName ?description 
+                (STRAFTER(str(?cncUUID), '#_') AS ?connectivityNodeContainerUUID)
+        
+        WHERE { 
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:ConnectivityNode .
+                OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?MRID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
+                OPTIONAL {?MRID cim:ConnectivityNode.ConnectivityNodeContainer ?cncUUID .}
+            }
+        }
+    `;
 //# sourceMappingURL=ConnectivityNode.js.map