npm - @enervance/insight-cim-model - Versions diffs - 0.0.45 → 0.0.47 - Mend

@enervance/insight-cim-model 0.0.45 → 0.0.47

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (270) hide show

package/dist/model/topology/TopologicalNode.js CHANGED Viewed

@@ -184,30 +184,30 @@ class TopologicalNode extends IdentifiedObject_1.IdentifiedObject {
     }
 }
 exports.TopologicalNode = TopologicalNode;
-TopologicalNode.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(?tpUUID), '#'), '_') AS ?uuid)
-        (CONCAT(STRBEFORE(str(?tpUUID), '#_'), '#_') AS ?baseIRI)
-        ?name ?shortName ?description
-        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID)
-        (strafter(strafter(str(?cncUUID), '#'), '_') AS ?connectivityNodeContainerUUID)
-        WHERE {
-            GRAPH <http://default/>{
-                ?tpUUID rdf:type cim:TopologicalNode .
-                OPTIONAL{?tpUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?tpUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?tpUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?tpUUID cim:TopologicalNode.BaseVoltage ?bvUUID .}
-                OPTIONAL{?tpUUID cim:TopologicalNode.ConnectivityNodeContainer ?cncUUID .}
-            }
-        }
+TopologicalNode.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(?tpUUID), '#'), '_') AS ?uuid)
+        (CONCAT(STRBEFORE(str(?tpUUID), '#_'), '#_') AS ?baseIRI)
+        ?name ?shortName ?description
+        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID)
+        (strafter(strafter(str(?cncUUID), '#'), '_') AS ?connectivityNodeContainerUUID)
+        WHERE {
+            GRAPH <http://default/>{
+                ?tpUUID rdf:type cim:TopologicalNode .
+                OPTIONAL{?tpUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?tpUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?tpUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?tpUUID cim:TopologicalNode.BaseVoltage ?bvUUID .}
+                OPTIONAL{?tpUUID cim:TopologicalNode.ConnectivityNodeContainer ?cncUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=TopologicalNode.js.map

package/dist/model/wires/ACLineSegment.d.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import { ISchemaSettings } from '../../interfaces/schema-settings/ShapeInfos';
 import { DiagramObject } from '../diagram/DiagramObject';
 import { Model } from '../model/Model';
 export declare class ACLineSegment extends Conductor implements IACLineSegment {
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string, length?: number);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string, length?: number, aggregate?: boolean);
     r0: number;
     x0: number;
     r: number;

package/dist/model/wires/ACLineSegment.js CHANGED Viewed

@@ -7,8 +7,8 @@ const utils_1 = require("../../converter/integral7/utils");
 const utils_2 = require("../../util/utils");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class ACLineSegment extends Conductor_1.Conductor {
-    constructor(uuid, name, shortName, description, length) {
-        super(uuid, name, shortName, description, length);
+    constructor(uuid, name, shortName, description, length, aggregate) {
+        super(uuid, name, shortName, description, length, aggregate);
         this.prop2namespacePrefix.set('r', 'cim');
         this.prop2Class.set('r', 'ACLineSegment');
         this.prop2Datatype.set('r', 'number');

package/dist/model/wires/ACLineSegment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ACLineSegment.js","sourceRoot":"","sources":["../../../src/model/wires/ACLineSegment.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAIxC,qDAAkD;AAElD,2DAA8D;AAG9D,4CAA4C;AAC5C,kEAAoF;AAIpF,MAAa,aAAc,SAAQ,qBAAS;IAE1C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,MAAe;~~QACjG~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;~~QAElD~~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"}
1	+ {"version":3,"file":"ACLineSegment.js","sourceRoot":"","sources":["../../../src/model/wires/ACLineSegment.ts"],"names":[],"mappings":"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"}

package/dist/model/wires/BusbarSection.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { Model } from "../model/Model";
 import XMLWriter from 'xml-writer';
 export declare class BusbarSection extends Connector {
     ipMax: number;
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string, aggregate?: boolean);
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
     static resolveClassFusekiJSON(data: any, cimModel: Model): void;

package/dist/model/wires/BusbarSection.js CHANGED Viewed

@@ -5,8 +5,8 @@ const Connector_1 = require("./Connector");
 const rdf_xml_1 = require("../../constants/rdf-xml");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class BusbarSection extends Connector_1.Connector {
-    constructor(uuid, name, shortName, description) {
-        super(uuid, name, shortName, description);
+    constructor(uuid, name, shortName, description, aggregate) {
+        super(uuid, name, shortName, description, aggregate);
     }
     static getQuerySPARQL(graphURI) {
         if (graphURI.length > 0) {

package/dist/model/wires/BusbarSection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BusbarSection.js","sourceRoot":"","sources":["../../../src/model/wires/BusbarSection.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qDAAgD;AAEhD,kEAAoF;AAEpF,MAAa,aAAc,SAAQ,qBAAS;IAIxC,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,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,aAAa,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,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,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;YAC1C,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACjD,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC,EAAE;IACP,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC5C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC5C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAC/B,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;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAChC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,sBAAsB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SACvF;IACL,CAAC;;AAtEL,sCAwEC;AAhEiB,yBAAW,GAAY;;;;;;;;;;;;;;;;;;;;KAoBpC,CAAA"}
1	+ {"version":3,"file":"BusbarSection.js","sourceRoot":"","sources":["../../../src/model/wires/BusbarSection.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEtC,qDAAgD;AAEhD,kEAAoF;AAEpF,MAAa,aAAc,SAAQ,qBAAS;IAIxC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,SAAmB;QACnG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAuBM,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC1C,IAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;YACnB,OAAO,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,aAAa,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,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,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;YAC1C,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACjD,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC,EAAE;IACP,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC5C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC5C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACjD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAC/B,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;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAChC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,sBAAsB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SACvF;IACL,CAAC;;AAtEL,sCAwEC;AAhEiB,yBAAW,GAAY;;;;;;;;;;;;;;;;;;;;KAoBpC,CAAA"}

package/dist/model/wires/Conductor.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import XMLWriter from 'xml-writer';
 import { IDefaultValuesConfig } from '../../converter/integral7/interface-i7/IDefaultValuesConfig';
 export declare class Conductor extends ConductingEquipment {
     length: number;
-    constructor(uuid: string, name: string, shortName: string, description: string, length: number);
+    constructor(uuid: string, name: string, shortName: string, description: string, length: number, aggregate?: boolean);
     protected resolveAttributesFusekiJSON(value: any): void;
     resolveParsedAssociations(cimModel: Model): void;
     toJSONAttributes(): void;

package/dist/model/wires/Conductor.js CHANGED Viewed

@@ -7,8 +7,8 @@ const rdf_xml_1 = require("../../constants/rdf-xml");
 const utils_2 = require("../../converter/integral7/utils");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 class Conductor extends ConductingEquipment_1.ConductingEquipment {
-    constructor(uuid, name, shortName, description, length) {
-        super(uuid, name, shortName, description);
+    constructor(uuid, name, shortName, description, length, aggregate) {
+        super(uuid, name, shortName, description, aggregate);
         this.length = +length;
         this.prop2namespacePrefix.set('length', 'cim');
         this.prop2Class.set('length', 'Conductor');

package/dist/model/wires/Conductor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Conductor.js","sourceRoot":"","sources":["../../../src/model/wires/Conductor.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,4CAA0C;AAG1C,qDAAgD;AAEhD,2DAA4D;AAC5D,kEAA6D;AAE7D,MAAa,SAAU,SAAQ,yCAAmB;IAIhD,YAAY,IAAY,EAAE,IAAY,EAAE,SAAiB,EAAE,WAAmB,EAAE,MAAc;~~QAC5F~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;~~QAC1C~~,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC;QAEtB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAC1C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAGM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IACpC,CAAC;IAEM,kBAAkB,CAAC,eAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC3C;IACH,CAAC;IAGS,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3F;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC;YACnD,IAAG,aAAa,CAAC,MAAM,KAAG,CAAC,EAAC;gBAC1B,aAAa,IAAI,QAAQ,CAAA;aAC1B;iBAAI;gBACH,aAAa,IAAI,SAAS,CAAA;aAC3B;SACF;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAClH,CAAC;IACM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAAA,CAAC;CACH;AAhED,8BAgEC"}
1	+ {"version":3,"file":"Conductor.js","sourceRoot":"","sources":["../../../src/model/wires/Conductor.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,4CAA0C;AAG1C,qDAAgD;AAEhD,2DAA4D;AAC5D,kEAA6D;AAE7D,MAAa,SAAU,SAAQ,yCAAmB;IAIhD,YAAY,IAAY,EAAE,IAAY,EAAE,SAAiB,EAAE,WAAmB,EAAE,MAAc,EAAE,SAAmB;QACjH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC;QAEtB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAC1C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAGM,gBAAgB;QACrB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IACpC,CAAC;IAEM,kBAAkB,CAAC,eAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC3C;IACH,CAAC;IAGS,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3F;IACH,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC;YACnD,IAAG,aAAa,CAAC,MAAM,KAAG,CAAC,EAAC;gBAC1B,aAAa,IAAI,QAAQ,CAAA;aAC1B;iBAAI;gBACH,aAAa,IAAI,SAAS,CAAA;aAC3B;SACF;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAClH,CAAC;IACM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAAA,CAAC;CACH;AAhED,8BAgEC"}

package/dist/model/wires/Connector.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { ConductingEquipment } from '../core/ConductingEquipment';
 export declare class Connector extends ConductingEquipment {
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string, aggregate?: boolean);
     breadthFirstSearch(networkElements: any[]): void;
 }

package/dist/model/wires/Connector.js CHANGED Viewed

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Connector = void 0;
 const ConductingEquipment_1 = require("../core/ConductingEquipment");
 class Connector extends ConductingEquipment_1.ConductingEquipment {
-    constructor(uuid, name, shortName, description) {
-        super(uuid, name, shortName, description);
+    constructor(uuid, name, shortName, description, aggregate) {
+        super(uuid, name, shortName, description, aggregate);
     }
     breadthFirstSearch(networkElements) {
         if (!this.visited) {

package/dist/model/wires/Connector.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Connector.js","sourceRoot":"","sources":["../../../src/model/wires/Connector.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,MAAa,SAAU,SAAQ,yCAAmB;IAE9C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;~~QAC9E~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;~~IAC9C~~,CAAC;IAEM,kBAAkB,CAAC,eAAsB;QAC5C,IAAG,CAAC,IAAI,CAAC,OAAO,EAAC;YACb,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC7C;IACL,CAAC;CACJ;AAZD,8BAYC"}
1	+ {"version":3,"file":"Connector.js","sourceRoot":"","sources":["../../../src/model/wires/Connector.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAEhE,MAAa,SAAU,SAAQ,yCAAmB;IAE9C,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,SAAmB;QACnG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAEM,kBAAkB,CAAC,eAAsB;QAC5C,IAAG,CAAC,IAAI,CAAC,OAAO,EAAC;YACb,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC7C;IACL,CAAC;CACJ;AAZD,8BAYC"}

package/dist/model/wires/EnergySource.d.ts CHANGED Viewed

@@ -18,7 +18,7 @@ export declare class EnergySource extends EnergyConnection {
     nominalVoltageValue: number;
     voltageMagnitude: number;
     voltageAngle: number;
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     print(): void;
     toGeoJSON(geoJSON: any, profile: string, schemaSettings: ISchemaSettings, diagramObject?: DiagramObject): any;
     static getQuerySPARQL(graphURI: string): string;

package/dist/model/wires/EnergySource.js CHANGED Viewed

@@ -8,8 +8,8 @@ const utils_2 = require("../../converter/integral7/utils");
 const xml_serializer_1 = require("../../util/xml/xml.serializer");
 const EnergyConnection_1 = require("./EnergyConnection");
 class EnergySource extends EnergyConnection_1.EnergyConnection {
-    constructor(uuid, name, shortName, description, baseIRI) {
-        super(uuid, name, shortName, description, baseIRI);
+    constructor(uuid, name, shortName, description) {
+        super(uuid, name, shortName, description);
         this.prop2namespacePrefix.set('activePower', 'cim');
         this.prop2Class.set('activePower', 'EnergySource');
         this.prop2Datatype.set('activePower', 'number');

package/dist/model/wires/EnergySource.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EnergySource.js","sourceRoot":"","sources":["../../../src/model/wires/EnergySource.ts"],"names":[],"mappings":";;;AAKA,4CAA0C;AAG1C,mFAOiD;AAEjD,qDAAgD;AAGhD,2DAA4D;AAC5D,kEAAoF;AACpF,yDAAsD;AAEtD,MAAa,YAAa,SAAQ,mCAAgB;IAkBhD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB~~,EAAE,OAAgB~~;~~QAClG~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,~~EAAE,OAAO,~~CAAC,CAAC;~~QAEnD~~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"}
1	+ {"version":3,"file":"EnergySource.js","sourceRoot":"","sources":["../../../src/model/wires/EnergySource.ts"],"names":[],"mappings":";;;AAKA,4CAA0C;AAG1C,mFAOiD;AAEjD,qDAAgD;AAGhD,2DAA4D;AAC5D,kEAAoF;AACpF,yDAAsD;AAEtD,MAAa,YAAa,SAAQ,mCAAgB;IAkBhD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAE1C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QACnD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAEhD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;QACrD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC;IAEM,KAAK;QACV,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAI,CAAC,WAAW,GAAG,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;IAC5F,CAAC;IAGM,SAAS,CAAC,OAAY,EAAE,OAAe,EAAE,cAA+B,EAAE,aAA6B;QAE5G,MAAM,WAAW,GAAa,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAwB,cAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAEtF,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9B,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,MAAM,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE;YACjD,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;YAEjE,MAAM,aAAa,GAAiB;gBAClC;oBACE,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;oBAC1B,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;oBACd,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC;oBACvB,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;oBACf,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;iBAC3B;aACF,CAAC;YACF,OAAO,CAAC,UAAU,CAAC,GAAG;gBACpB,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,aAAa;aAC3B,CAAA;YAED,OAAO,CAAC,YAAY,CAAC,GAAG;gBACtB,iBAAiB,EAAE,aAAa,CAAC,IAAI;gBACrC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;aAClC,CAAA;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,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;QACD,OAAO,YAAY,CAAC,WAAW,CAAC;IAClC,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,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;YACpC,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC5C,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC,EAAE;IACL,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACnD,IAAI,CAAC,aAAa,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QACvD,IAAI,CAAC,mBAAmB,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAChE,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;QAC7D,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IACtC,CAAC;IAGM,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;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC;IAElD,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;IAEM,oBAAoB,CAAC,eAAuB;QACjD,KAAK,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAC9C,CAAC;IAEM,kBAAkB,CAAC,eAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;SAC3C;IACH,CAAC;IAGM,yBAAyB,CAAC,SAA8B;QAC7D,OAAO;IACT,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAEM,SAAS;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACzB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACvE,IAAI,aAAa,KAAK,CAAC,EAAE;YACvB,OAAO,CAAC,CAAC;SACV;aAAM,IAAI,IAAI,KAAK,CAAC,EAAE;YACrB,OAAO,CAAC,CAAC;SACV;aAAM,IAAI,aAAa,KAAK,CAAC,IAAI,IAAI,EAAE;YACtC,OAAO,IAAI,GAAC,aAAa,CAAC;SAC3B;aAAM;YACL,OAAO,CAAC,CAAC;SACV;IACH,CAAC;IAEM,IAAI;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAA;IACvD,CAAC;IAEM,IAAI;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;IAC5D,CAAC;IAIM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YAC1G,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,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;SACxB;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,iBAAiB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YACjH,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACvF,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACzF,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACzF,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACvF,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACzF,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACzF,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,mBAAmB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACrH,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;SAC9G;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;YAC1C,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3G,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,gBAAgB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;SAChH;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAKD,eAAe,CAAC,OAAe;QAC7B,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,EAAE;YACnC,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBAC3C,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAIM,MAAM,CAAC,kBAAkB,CAAC,IAAY,EAAE,QAAe;QAC5D,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;QACxC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACnC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,uBAAuB,CAAC,SAAiB,EAAE,QAAgB,EAAE,KAAa;QAC/E,IAAI,SAAS,KAAK,cAAc,EAAE;SAEjC;aAAM;YACL,KAAK,CAAC,uBAAuB,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;SAC3D;IACH,CAAC;IAEM,wBAAwB,CAAC,SAAiB,EAAE,YAAoB,EAAE,YAAoB;QAC3F,IAAI,SAAS,KAAK,cAAc,EAAE;SAEjC;aAAM;YACL,KAAK,CAAC,wBAAwB,CAAC,SAAS,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;SACvE;IACH,CAAC;IACD,cAAc,CAAC,WAAmB;QAChC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC/H,CAAC;IACD,gBAAgB,CAAC,aAAqB;QACpC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IACnI,CAAC;IAGD,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,mBAAmB,CAAC,YAAY,CAAC,WAAW,CAAC;YAChE,aAAa,IAAI,cAAc,CAAA;SAChC;QACD,IAAI,CAAC,mBAAW,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;YACpC,IAAI,CAAC,aAAa,GAAG,mBAAmB,CAAC,YAAY,CAAC,aAAa,CAAC;YACpE,aAAa,IAAI,gBAAgB,CAAA;SAClC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,cAAc,IAAI,aAAa,CAAC,MAAM;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,GAAG,CAAC;QAC9G,OAAO,aAAa,CAAC;IACvB,CAAC;;AApQH,oCAoTC;AA9Ce,wBAAW,GAAW;UAC5B,qCAAa;UACb,2CAAmB;UACnB,wCAAgB;UAChB,qCAAa;UACb,qCAAa;UACb,wCAAgB;UAChB,qCAAa;UACb,qCAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAqClB,CAAA"}

package/dist/model/wires/PowerTransformer.js CHANGED Viewed

@@ -158,32 +158,32 @@ class PowerTransformer extends ConductingEquipment_1.ConductingEquipment {
     }
 }
 exports.PowerTransformer = PowerTransformer;
-PowerTransformer.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(?trUUID), '#'), '_') AS ?uuid)
-        (CONCAT(STRBEFORE(STR(?trUUID), '#_'), '#_') AS ?baseIRI)
-        ?name ?shortName ?description ?installation ?isPartOfGeneratorUnit
-        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
-        WHERE {
-            GRAPH <http://default/>{
-                ?trUUID rdf:type cim:PowerTransformer .
-                OPTIONAL {?trUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?trUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL {?trUUID enervance:IdentifiedObject.installation ?installation .}
-                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL {?trUUID cim:PowerTransformer.isPartOfGeneratorUnit ?isPartOfGeneratorUnit .}
-                OPTIONAL {?trUUID cim:Equipment.EquipmentContainer ?ecUUID .}
-            }
-        }
+PowerTransformer.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(?trUUID), '#'), '_') AS ?uuid)
+        (CONCAT(STRBEFORE(STR(?trUUID), '#_'), '#_') AS ?baseIRI)
+        ?name ?shortName ?description ?installation ?isPartOfGeneratorUnit
+        (strafter(strafter(str(?ecUUID), '#'), '_') AS ?equipmentContainerUUID)
+        WHERE {
+            GRAPH <http://default/>{
+                ?trUUID rdf:type cim:PowerTransformer .
+                OPTIONAL {?trUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?trUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL {?trUUID enervance:IdentifiedObject.installation ?installation .}
+                OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL {?trUUID cim:PowerTransformer.isPartOfGeneratorUnit ?isPartOfGeneratorUnit .}
+                OPTIONAL {?trUUID cim:Equipment.EquipmentContainer ?ecUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=PowerTransformer.js.map

package/dist/model/wires/PowerTransformerEnd.js CHANGED Viewed

@@ -119,36 +119,36 @@ class PowerTransformerEnd extends TransformerEnd_1.TransformerEnd {
     }
 }
 exports.PowerTransformerEnd = PowerTransformerEnd;
-PowerTransformerEnd.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(?ptreUUID), '#'), '_') AS ?uuid)
-        ?name ?shortName ?description ?r ?x ?ratedS ?ratedU ?endNumber
-        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID)
-        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?powerTransformerUUID)
-         (strafter(strafter(str(?trUUID), '#'), '_') AS ?terminalUUID)
-        WHERE {
-            GRAPH <http://default/>{
-                ?ptreUUID rdf:type cim:PowerTransformerEnd .
-                OPTIONAL{?ptreUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?ptreUUID entsoe:IdentifiedObject.shortName ?shortName .}
-                OPTIONAL{?ptreUUID cim:IdentifiedObject.description ?description .}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.r ?r .}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.x ?x .}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.ratedS ?ratedS .}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.ratedU ?ratedU .}
-                OPTIONAL{?ptreUUID cim:TransformerEnd.endNumber ?endNumber .}
-                OPTIONAL{?ptreUUID cim:TransformerEnd.BaseVoltage ?bvUUID}
-                OPTIONAL{?ptreUUID cim:TransformerEnd.Terminal ?trUUID.}
-                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.PowerTransformer ?ptUUID.}
-            }
-        }
+PowerTransformerEnd.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(?ptreUUID), '#'), '_') AS ?uuid)
+        ?name ?shortName ?description ?r ?x ?ratedS ?ratedU ?endNumber
+        (strafter(strafter(str(?bvUUID), '#'), '_') AS ?baseVoltageUUID)
+        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?powerTransformerUUID)
+         (strafter(strafter(str(?trUUID), '#'), '_') AS ?terminalUUID)
+        WHERE {
+            GRAPH <http://default/>{
+                ?ptreUUID rdf:type cim:PowerTransformerEnd .
+                OPTIONAL{?ptreUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?ptreUUID entsoe:IdentifiedObject.shortName ?shortName .}
+                OPTIONAL{?ptreUUID cim:IdentifiedObject.description ?description .}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.r ?r .}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.x ?x .}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.ratedS ?ratedS .}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.ratedU ?ratedU .}
+                OPTIONAL{?ptreUUID cim:TransformerEnd.endNumber ?endNumber .}
+                OPTIONAL{?ptreUUID cim:TransformerEnd.BaseVoltage ?bvUUID}
+                OPTIONAL{?ptreUUID cim:TransformerEnd.Terminal ?trUUID.}
+                OPTIONAL{?ptreUUID cim:PowerTransformerEnd.PowerTransformer ?ptUUID.}
+            }
+        }
     `;
 //# sourceMappingURL=PowerTransformerEnd.js.map

package/dist/model/wires/RegulatingControl.js CHANGED Viewed

@@ -142,36 +142,36 @@ class RegulatingControl extends __1.PowerSystemResource {
     }
 }
 exports.RegulatingControl = RegulatingControl;
-RegulatingControl.sparqlQuery = `
-        ${sparql_building_block_1.NS_PREFIX_CIM}
-        ${sparql_building_block_1.NS_PREFIX_ENERVANCE}
-        ${sparql_building_block_1.NS_PREFIX_ENTSOE}
-        ${sparql_building_block_1.NS_PREFIX_RDF}
-        ${sparql_building_block_1.NS_PREFIX_RDF}
-        ${sparql_building_block_1.NS_PREFIX_ENTSOE}
-        ${sparql_building_block_1.NS_PREFIX_APF}
-        ${sparql_building_block_1.NS_PREFIX_AFN}
-        SELECT  (strafter(strafter(str(?regCntrUUID), '#'), '_') AS ?uuid)
-                (CONCAT(STRBEFORE(STR(?regCntrUUID), '#_'), '#_') AS ?baseIRI)
-                ?name  ?discrete ?targetDeadband
-                ?enabled ?targetValue
-                (strafter(strafter(str(?modeEnum), '#'), '.') AS ?mode)
-                (strafter(strafter(str(?targetValueMultrEnum), '#'), '.') AS ?targetValueUnitMultiplier)
-                (strafter(strafter(str(?trUUID), '#'), '_') AS ?terminalUUID)
-        WHERE {
-            GRAPH <http://default/>{
-                ?regCntrUUID rdf:type cim:RegulatingControl .
-                OPTIONAL{?regCntrUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL{?regCntrUUID cim:RegulatingControl.discrete ?discrete .}
-                OPTIONAL{?regCntrUUID cim:RegulatingControl.targetDeadband ?targetDeadband .}
-                OPTIONAL{?regCntrUUID cim:RegulatingControl.enabled ?enabled .}
-                OPTIONAL{?regCntrUUID cim:RegulatingControl.targetValue ?targetValue .}
-                OPTIONAL{?regCntrUUID cim:RegulatingControl.mode ?modeEnum .}
-                OPTIONAL{?regCntrUUID cim:RegulatingControl.targetValueUnitMultiplier ?targetValueMultrEnum .}
-                OPTIONAL{?regCntrUUID cim:RegulatingControl.Terminal ?trUUID .}
-            }
-        }
+RegulatingControl.sparqlQuery = `
+        ${sparql_building_block_1.NS_PREFIX_CIM}
+        ${sparql_building_block_1.NS_PREFIX_ENERVANCE}
+        ${sparql_building_block_1.NS_PREFIX_ENTSOE}
+        ${sparql_building_block_1.NS_PREFIX_RDF}
+        ${sparql_building_block_1.NS_PREFIX_RDF}
+        ${sparql_building_block_1.NS_PREFIX_ENTSOE}
+        ${sparql_building_block_1.NS_PREFIX_APF}
+        ${sparql_building_block_1.NS_PREFIX_AFN}
+        SELECT  (strafter(strafter(str(?regCntrUUID), '#'), '_') AS ?uuid)
+                (CONCAT(STRBEFORE(STR(?regCntrUUID), '#_'), '#_') AS ?baseIRI)
+                ?name  ?discrete ?targetDeadband
+                ?enabled ?targetValue
+                (strafter(strafter(str(?modeEnum), '#'), '.') AS ?mode)
+                (strafter(strafter(str(?targetValueMultrEnum), '#'), '.') AS ?targetValueUnitMultiplier)
+                (strafter(strafter(str(?trUUID), '#'), '_') AS ?terminalUUID)
+        WHERE {
+            GRAPH <http://default/>{
+                ?regCntrUUID rdf:type cim:RegulatingControl .
+                OPTIONAL{?regCntrUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL{?regCntrUUID cim:RegulatingControl.discrete ?discrete .}
+                OPTIONAL{?regCntrUUID cim:RegulatingControl.targetDeadband ?targetDeadband .}
+                OPTIONAL{?regCntrUUID cim:RegulatingControl.enabled ?enabled .}
+                OPTIONAL{?regCntrUUID cim:RegulatingControl.targetValue ?targetValue .}
+                OPTIONAL{?regCntrUUID cim:RegulatingControl.mode ?modeEnum .}
+                OPTIONAL{?regCntrUUID cim:RegulatingControl.targetValueUnitMultiplier ?targetValueMultrEnum .}
+                OPTIONAL{?regCntrUUID cim:RegulatingControl.Terminal ?trUUID .}
+            }
+        }
     `;
 //# sourceMappingURL=RegulatingControl.js.map

package/dist/model/wires/Switch.js CHANGED Viewed

@@ -136,37 +136,37 @@ class Switch extends ConductingEquipment_1.ConductingEquipment {
     }
 }
 exports.Switch = Switch;
-Switch.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:Switch .
-                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
+Switch.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:Switch .
+                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=Switch.js.map

package/dist/model/wires/SynchronousMachine.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { RotatingMachine } from './RotatingMachine';
 import { IConnectivityNode, IdentifiedObject, Model, ReactiveCapabilityCurve, ShortCircuitRotorKind, SynchronousMachineKind } from '../..';
 import XMLWriter from 'xml-writer';
-import { TripleData } from '../../interfaces/persistence.interfaces';
+import { TripleData } from '../../interfaces/persistence-interfaces';
 import { SynchronousMachineOperatingMode } from './SynchronousMachineOperatingMode';
 import { IDefaultValuesConfig } from '../../converter/integral7/interface-i7/IDefaultValuesConfig';
 import { SynchronousMachineDynamics } from "../dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineDynamics";

package/dist/util/sparql/sparql-utils.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { TripleData, TripleDataKind } from '../../interfaces/persistence.interfaces';
+import { TripleData, TripleDataKind } from '../../interfaces/persistence-interfaces';
 export declare function getNewInsertSPARQL(className: string, uuid: string, baseIRI: string, graphURI: string): string;
 export declare function checkGraphName(graphName: string): string;
 export declare function getDeleteWhereObjectSPARQL(baseIRI: string, mrid: string, namespace: string, className: string, propName: any): string;