@enervance/insight-cim-model 0.0.46 → 0.0.47

package/dist/model/common/CoordinateSystem.js

@@ -65,26 +65,26 @@ class CoordinateSystem extends __1.IdentifiedObject {
         return this.getPropertySparqlTriple(this.baseIRI, this.mrid, 'cim', 'CoordinateSystem', 'crsUrn', this.crsUrn);
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:CoordinateSystem ;
-                cim:IdentifiedObject.name "${this.name}" .
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:CoordinateSystem ;
+                cim:IdentifiedObject.name "${this.name}" .
         `;
     }
 }
 exports.CoordinateSystem = CoordinateSystem;
-CoordinateSystem.sparqlQuery = `
-                PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
-                PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
-
-                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
-                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
-                        ?crsUrn       
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:CoordinateSystem .
-                        OPTIONAL {?MRID cim:CoordinateSystem.crsUrn ?crsUrn .}
-                    }
-                }
+CoordinateSystem.sparqlQuery = `
+                PREFIX cim:	 		<http://iec.ch/TC57/2013/CIM-schema-cim16#> 
+                PREFIX rdf:	 		<http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+
+                SELECT  (strafter(strafter(str(?MRID), '#'), '_') AS ?uuid) 
+                        (CONCAT(STRBEFORE(STR(?MRID), '#_'), '#_') AS ?baseIRI) 
+                        ?crsUrn       
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type cim:CoordinateSystem .
+                        OPTIONAL {?MRID cim:CoordinateSystem.crsUrn ?crsUrn .}
+                    }
+                }
                 `;
 //# sourceMappingURL=CoordinateSystem.js.map

package/dist/model/common/Location.js

@@ -152,27 +152,27 @@ class Location extends __1.IdentifiedObject {
     }
 }
 exports.Location = Location;
-Location.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/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) 
-                        (strafter(strafter(str(?csUUIDs), '#'), '_') AS ?coordinateSystemUUID) 
-                        (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourcesUUIDs)
-                                
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type cim:Location .
-                        OPTIONAL {?MRID cim:Location.CoordinateSystem ?csUUIDs .}
-                        OPTIONAL {?MRID cim:Location.PowerSystemResources ?psrUUIDs .}
-                    }
-                }
-                GROUP BY ?MRID ?baseIRI ?csUUIDs
+Location.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/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) 
+                        (strafter(strafter(str(?csUUIDs), '#'), '_') AS ?coordinateSystemUUID) 
+                        (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourcesUUIDs)
+                                
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type cim:Location .
+                        OPTIONAL {?MRID cim:Location.CoordinateSystem ?csUUIDs .}
+                        OPTIONAL {?MRID cim:Location.PowerSystemResources ?psrUUIDs .}
+                    }
+                }
+                GROUP BY ?MRID ?baseIRI ?csUUIDs
                 `;
 //# sourceMappingURL=Location.js.map

package/dist/model/common/PositionPoint.js

@@ -90,8 +90,8 @@ class PositionPoint extends __1.IdentifiedObject {
         return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'cim', 'PositionPoint', 'Location', location.mrid);
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
+        return `
+            <${this.baseIRI}${this.mrid}>
             a   cim:PositionPoint .`;
     }
     setSequenceNumber(sequenceNumber) {
@@ -108,28 +108,28 @@ class PositionPoint extends __1.IdentifiedObject {
     }
 }
 exports.PositionPoint = PositionPoint;
-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/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) 
-                        (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 .}
-                    }
-                }
+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/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) 
+                        (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/core/BaseVoltage.js

@@ -85,27 +85,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/2018/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) 
-                ?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 .}
-                    }
-                }
+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/2018/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) 
+                ?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/Bay.d.ts

@@ -7,7 +7,7 @@ import { DiagramObject, ISchemaSettings, Model } from "../..";
 export declare class Bay extends EquipmentContainer {
     voltageLevel: VoltageLevel | undefined;
     voltageLevelUUID: string | undefined;
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
     static resolveClassFusekiJSON(data: any, cimModel: Model): void;

package/dist/model/core/Bay.js

@@ -6,8 +6,8 @@ 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 {
-    constructor(uuid, name, shortName, description, baseIRI) {
-        super(uuid, name, shortName, description, baseIRI);
+    constructor(uuid, name, shortName, description) {
+        super(uuid, name, shortName, description);
     }
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {

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":";;;AAAA,mEAA8D;AAK9D,4CAA0C;AAC1C,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,GAAI,SAAQ,uCAAkB;IAKzC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IA2BM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC/D;QACD,OAAO,GAAG,CAAC,WAAW,CAAC;IACzB,CAAC;IAEM,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,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,GAAG,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAA;YACtC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC,EAAE;IACL,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,gBAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC9D,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAE1C,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpE,IAAI,IAAI,CAAC,YAAY;YAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;;YACjD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,0BAA0B,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACjH,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;QAC3B,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC;IACrG,CAAC;IAEM,sBAAsB;QAC3B,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,YAAY,CAAC,sBAAsB,EAAE,CAAC;SACnD;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAEM,cAAc;;QACnB,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,aAAO,IAAI,CAAC,YAAY,0CAAE,WAAW,CAAC;SACvC;IACH,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAEM,aAAa;QAClB,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;SAC1C;QACD,OAAO;IACT,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAEhD,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;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,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,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACnD,IAAI,IAAI,CAAC,gBAAgB,EAAE;gBACzB,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,kBAAkB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACvF,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;gBAC1G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,SAAS,CAAC,YAAY,CAAC,6BAA6B,CAAC,CAAC;aACvD;SACF;IACH,CAAC;IAEM,SAAS,CAAC,OAAY,EAAE,OAAe,EAAE,cAA+B,EAAE,aAA6B;QAC5G,IAAI,aAAa,EAAE;YACjB,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;YAEjE,MAAM,SAAS,GAAG,aAAa,CAAC,mBAAmB,CAAC;YACpD,MAAM,MAAM,GAAe,EAAE,CAAC;YAC9B,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC/D,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;aAChE;YAID,MAAM,aAAa,GAAiB,EAAE,CAAC;YACvC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE3B,OAAO,CAAC,UAAU,CAAC,GAAG;gBACpB,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,aAAa;aAC3B,CAAC;YACF,OAAO,CAAC,YAAY,CAAC,GAAG;gBACtB,iBAAiB,EAAE,aAAa,CAAC,IAAI;gBACrC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;gBACjC,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;gBACT,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,IAAI,EAAE,SAAS;aAChB,CAAA;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,mBAAmB;QACxB,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SACpC;aAAM;YACL,OAAO,IAAI,CAAC,gBAAgB,CAAC;SAC9B;IACH,CAAC;;AA7KH,kBA8KC;AArKe,eAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;KAsBjC,CAAA"}

package/dist/model/core/ConductingEquipment.d.ts

@@ -17,7 +17,7 @@ export declare class ConductingEquipment extends Equipment implements IConductin
     svStatus: SvStatus;
     svStatusUUID: string | undefined;
     outages: Map<string, IOutage>;
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string, aggregate?: boolean);
     addTerminal(terminal: Terminal): void;
     getTerminal(uuid: string): ITerminal | undefined;
     getTerminals(): Map<string, ITerminal> | undefined;

package/dist/model/core/ConductingEquipment.js

@@ -6,8 +6,8 @@ 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 {
-    constructor(uuid, name, shortName, description, baseIRI) {
-        super(uuid, name, shortName, description, baseIRI);
+    constructor(uuid, name, shortName, description, aggregate) {
+        super(uuid, name, shortName, description, aggregate);
         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":"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"}
+{"version":3,"file":"ConductingEquipment.js","sourceRoot":"","sources":["../../../src/model/core/ConductingEquipment.ts"],"names":[],"mappings":"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"}

package/dist/model/core/ConnectivityNode.js

@@ -384,29 +384,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 .}
-            }
-        }
+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

package/dist/model/core/ConnectivityNodeContainer.d.ts

@@ -5,7 +5,7 @@ import { IConnectivityNode } from '../../interfaces/model/core/IConnectivityNode
 export declare class ConnectivityNodeContainer extends PowerSystemResource implements IConnectivityNodeContainer {
     connectivityNodes: IConnectivityNode[];
     topologicalNodes: TopologicalNode[];
-    constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
+    constructor(mrid?: string, name?: string, shortName?: string, description?: string);
     addConnectivityNode(connectivityNode: IConnectivityNode): void;
     addTopologicalNode(topologicalNode: TopologicalNode): void;
 }

package/dist/model/core/ConnectivityNodeContainer.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectivityNodeContainer = void 0;
 const PowerSystemResource_1 = require("../core/PowerSystemResource");
 class ConnectivityNodeContainer extends PowerSystemResource_1.PowerSystemResource {
-    constructor(mrid, name, shortName, description, baseIRI) {
-        super(mrid, name, shortName, description, baseIRI);
+    constructor(mrid, name, shortName, description) {
+        super(mrid, name, shortName, description);
         this.connectivityNodes = [];
         this.topologicalNodes = [];
     }

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

@@ -1 +1 @@
-{"version":3,"file":"ConnectivityNodeContainer.js","sourceRoot":"","sources":["../../../src/model/core/ConnectivityNodeContainer.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAKhE,MAAa,yBAA0B,SAAQ,yCAAmB;IAKhE,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,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC7B,CAAC;IAEM,mBAAmB,CAAC,gBAAmC;QAC5D,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAEM,kBAAkB,CAAC,eAAgC;QACxD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC9C,CAAC;CAEF;AAnBD,8DAmBC"}
+{"version":3,"file":"ConnectivityNodeContainer.js","sourceRoot":"","sources":["../../../src/model/core/ConnectivityNodeContainer.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAKhE,MAAa,yBAA0B,SAAQ,yCAAmB;IAKhE,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC7B,CAAC;IAEM,mBAAmB,CAAC,gBAAmC;QAC5D,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAEM,kBAAkB,CAAC,eAAgC;QACxD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC9C,CAAC;CAEF;AAnBD,8DAmBC"}

package/dist/model/core/Equipment.d.ts

@@ -14,7 +14,7 @@ export declare class Equipment extends PowerSystemResource {
     additionalEquipmentContainer: Map<string, IEquipmentContainer>;
     additionalEquipmentContainerUUIDs: string[];
     normallyInService: boolean;
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string, aggregate?: boolean);
     addOperationalLimitSet(operationalLimitSet: OperationalLimitSet): void;
     addAdditionalEquipmentContainer(equipmentContainer: IEquipmentContainer): string;
     getAdditionalEquipmentContainer(uuid?: string): IEquipmentContainer | undefined;

package/dist/model/core/Equipment.js

@@ -11,9 +11,9 @@ const EquipmentContainer_1 = require("./EquipmentContainer");
 const PowerSystemResource_1 = require("./PowerSystemResource");
 const VoltageLevel_1 = require("./VoltageLevel");
 class Equipment extends PowerSystemResource_1.PowerSystemResource {
-    constructor(uuid, name, shortName, description, baseIRI) {
-        super(uuid, name, shortName, description, baseIRI);
-        this.aggregate = true;
+    constructor(uuid, name, shortName, description, aggregate) {
+        super(uuid, name, shortName, description);
+        this.aggregate = aggregate !== null && aggregate !== void 0 ? aggregate : true;
         this.operationalLimitSets = [];
         this.additionalEquipmentContainer = new Map();
         this.additionalEquipmentContainerUUIDs = [];

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

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

package/dist/model/core/EquipmentContainer.d.ts

@@ -5,7 +5,7 @@ import { IEquipmentContainer } from '../../interfaces/model/core/IEquipmentConta
 export declare class EquipmentContainer extends ConnectivityNodeContainer implements IEquipmentContainer {
     equipments: Equipment[];
     additionalGroupedEquipment: Map<string, Equipment>;
-    constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
+    constructor(mrid?: string, name?: string, shortName?: string, description?: string);
     addEquipment(equipment: Equipment): void;
     addAdditionalGroupedEquipment(equipment: Equipment): void;
     getSubstation(): Substation | undefined;

package/dist/model/core/EquipmentContainer.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EquipmentContainer = void 0;
 const ConnectivityNodeContainer_1 = require("../core/ConnectivityNodeContainer");
 class EquipmentContainer extends ConnectivityNodeContainer_1.ConnectivityNodeContainer {
-    constructor(mrid, name, shortName, description, baseIRI) {
-        super(mrid, name, shortName, description, baseIRI);
+    constructor(mrid, name, shortName, description) {
+        super(mrid, name, shortName, description);
         this.equipments = [];
         this.additionalGroupedEquipment = new Map();
     }

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

@@ -1 +1 @@
-{"version":3,"file":"EquipmentContainer.js","sourceRoot":"","sources":["../../../src/model/core/EquipmentContainer.ts"],"names":[],"mappings":";;;AAAA,iFAA4E;AAK5E,MAAa,kBAAmB,SAAQ,qDAAyB;IAM/D,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,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,0BAA0B,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9C,CAAC;IAEM,YAAY,CAAC,SAAoB;QACtC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;YAC7C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,+BAA+B,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,EAAE,CAAC,CAAC;SACvH;IACH,CAAC;IAEM,6BAA6B,CAAC,SAAoB;QACvD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;IACtE,CAAC;IAEM,aAAa;QAClB,OAAO;IACT,CAAC;IAGM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC,CAAC;IACxF,CAAC;CAEF;AAlCD,gDAkCC"}
+{"version":3,"file":"EquipmentContainer.js","sourceRoot":"","sources":["../../../src/model/core/EquipmentContainer.ts"],"names":[],"mappings":";;;AAAA,iFAA4E;AAK5E,MAAa,kBAAmB,SAAQ,qDAAyB;IAM/D,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,0BAA0B,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9C,CAAC;IAEM,YAAY,CAAC,SAAoB;QACtC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;YAC7C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,+BAA+B,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,EAAE,CAAC,CAAC;SACvH;IACH,CAAC;IAEM,6BAA6B,CAAC,SAAoB;QACvD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;IACtE,CAAC;IAEM,aAAa;QAClB,OAAO;IACT,CAAC;IAGM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC,CAAC;IACxF,CAAC;CAEF;AAlCD,gDAkCC"}

package/dist/model/core/Feeder.js

@@ -75,10 +75,10 @@ class Feeder extends EquipmentContainer_1.EquipmentContainer {
         }
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Feeder ;
-                cim:IdentifiedObject.name "Feeder" .
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:Feeder ;
+                cim:IdentifiedObject.name "Feeder" .
         `;
     }
     static resolveClassFusekiJSON(data, cimModel) {
@@ -118,30 +118,30 @@ class Feeder extends EquipmentContainer_1.EquipmentContainer {
     }
 }
 exports.Feeder = Feeder;
-Feeder.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(?fUUID), "#"), "_") AS ?uuid) 
-        (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI) 
-        ?name ?shortName ?description
-        (STRAFTER(str(?negsUUID), '#_') AS ?normalEnergizingSubstationUUID) 
-        (group_concat(STRAFTER(str(?nedsUUIDs), '#_');separator=',') as ?energizedSubstationUUIDs)
-        WHERE { 
-            GRAPH <http://default/>{
-            
-                ?fUUID rdf:type cim:Feeder .
-                OPTIONAL{?fUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?fUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?fUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?fUUID cim:Feeder.NormalEnergizingSubstation ?negsUUID .}
-                OPTIONAL{?fUUID cim:Feeder.NormalEnergizedSubstation ?nedsUUIDs . }
-            }
-        }
-        GROUP BY ?fUUID ?baseIRI ?name ?shortName ?description ?negsUUID
+Feeder.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(?fUUID), "#"), "_") AS ?uuid) 
+        (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI) 
+        ?name ?shortName ?description
+        (STRAFTER(str(?negsUUID), '#_') AS ?normalEnergizingSubstationUUID) 
+        (group_concat(STRAFTER(str(?nedsUUIDs), '#_');separator=',') as ?energizedSubstationUUIDs)
+        WHERE { 
+            GRAPH <http://default/>{
+            
+                ?fUUID rdf:type cim:Feeder .
+                OPTIONAL{?fUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?fUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?fUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?fUUID cim:Feeder.NormalEnergizingSubstation ?negsUUID .}
+                OPTIONAL{?fUUID cim:Feeder.NormalEnergizedSubstation ?nedsUUIDs . }
+            }
+        }
+        GROUP BY ?fUUID ?baseIRI ?name ?shortName ?description ?negsUUID
     `;
 //# sourceMappingURL=Feeder.js.map

package/dist/model/core/IdentifiedObject.d.ts

@@ -8,10 +8,8 @@ import { IDefaultValuesConfig } from '../../converter/integral7/interface-i7/IDe
 import { ILogger } from '../../interfaces/ILogger';
 import { IConnectivityNode } from '../../interfaces/model/core/IConnectivityNode';
 import { IIdentifiedObject } from '../../interfaces/model/core/IIdentifiedObject';
-import { TripleData } from '../../interfaces/persistence.interfaces';
-import { ChangeSetMember } from '../generic-data-set/ChangeSetMember';
-import { InstanceSet } from '../generic-data-set/InstanceSet';
-export declare class IdentifiedObject implements IObservable, IIdentifiedObject {
+import { TripleData } from '../../interfaces/persistence-interfaces';
+export declare abstract class IdentifiedObject implements IObservable, IIdentifiedObject {
     mrid: string;
     name: string;
     shortName: string;
@@ -26,11 +24,8 @@ export declare class IdentifiedObject implements IObservable, IIdentifiedObject
     visited: boolean;
     id: number;
     installation: number;
-    propertiesCIMDataObject?: ChangeSetMember;
-    targetingCIMDataObjects: Set<ChangeSetMember>;
-    instanceSet: InstanceSet;
     protected json: any;
-    protected constructor(mrid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
+    protected constructor(mrid?: string, name?: string, shortName?: string, description?: string);
     hasSwitchAssociation(): boolean;
     print(): void;
     getUUID(): string;

package/dist/model/core/IdentifiedObject.js

@@ -7,15 +7,13 @@ const sparql_utils_1 = require("../../util/sparql/sparql-utils");
 const utils_1 = require("../../util/utils");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class IdentifiedObject {
-    constructor(mrid, name, shortName, description, baseIRI) {
+    constructor(mrid, name, shortName, description) {
         this.visited = false;
         this.id = 0;
-        this.targetingCIMDataObjects = new Set();
         this.mrid = mrid || '';
         this.name = name || 'kein Name';
         this.shortName = shortName;
         this.description = description;
-        this.baseIRI = baseIRI;
         this.diagramObjects = [];
         this.observers = [];
         this.prop2namespacePrefix = new Map();