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/extensions/enervance/assetinfo/EVWireInfo.js CHANGED Viewed

@@ -70,9 +70,9 @@ class EVWireInfo extends WireInfo_1.WireInfo {
         this.insulation = utils_1.getValue(value, 'insulation');
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:WireInfo ;
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:WireInfo ;
                 cim:IdentifiedObject.name '${this.name}' .`;
     }
     setR1(r) {
@@ -89,40 +89,40 @@ class EVWireInfo extends WireInfo_1.WireInfo {
     }
 }
 exports.EVWireInfo = EVWireInfo;
-EVWireInfo.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)
-                ?name ?r0 ?x0 ?c0 ?r1 ?x1 ?c1 ?b ?g ?sizeDescription ?strandCount
-                ?ratedCurrent ?voltage ?type ?failureProbability ?insulation
-        WHERE {
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:WireInfo .
-                OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?MRID cim:WireInfo.ratedCurrent ?ratedCurrent .}
-                OPTIONAL {?MRID cim:WireInfo.sizeDescription ?sizeDescription .}
-                OPTIONAL {?MRID enervance:EVWireInfo.r0 ?r0 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.x0 ?x0 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.c0 ?c0 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.r1 ?r1 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.x1 ?x1 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.c1 ?c1 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.b  ?b  .}
-                OPTIONAL {?MRID enervance:EVWireInfo.g  ?g  .}
-                OPTIONAL {?MRID enervance:EVWireInfo.strandCount  ?strandCount .}
-                OPTIONAL {?MRID enervance:EVWireInfo.voltage ?voltage .}
-                OPTIONAL {?MRID enervance:EVWireInfo.type ?type  .}
-                OPTIONAL {?MRID enervance:EVWireInfo.failureProbability ?failureProbability .}
-                OPTIONAL {?MRID enervance:EVWireInfo.insulation ?insulation .}
-            }
-        }
+EVWireInfo.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)
+                ?name ?r0 ?x0 ?c0 ?r1 ?x1 ?c1 ?b ?g ?sizeDescription ?strandCount
+                ?ratedCurrent ?voltage ?type ?failureProbability ?insulation
+        WHERE {
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:WireInfo .
+                OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?MRID cim:WireInfo.ratedCurrent ?ratedCurrent .}
+                OPTIONAL {?MRID cim:WireInfo.sizeDescription ?sizeDescription .}
+                OPTIONAL {?MRID enervance:EVWireInfo.r0 ?r0 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.x0 ?x0 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.c0 ?c0 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.r1 ?r1 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.x1 ?x1 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.c1 ?c1 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.b  ?b  .}
+                OPTIONAL {?MRID enervance:EVWireInfo.g  ?g  .}
+                OPTIONAL {?MRID enervance:EVWireInfo.strandCount  ?strandCount .}
+                OPTIONAL {?MRID enervance:EVWireInfo.voltage ?voltage .}
+                OPTIONAL {?MRID enervance:EVWireInfo.type ?type  .}
+                OPTIONAL {?MRID enervance:EVWireInfo.failureProbability ?failureProbability .}
+                OPTIONAL {?MRID enervance:EVWireInfo.insulation ?insulation .}
+            }
+        }
     `;
 //# sourceMappingURL=EVWireInfo.js.map

package/dist/model/extensions/enervance/wires/EVACLineSegment.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { Model } from '../../../model/Model';
 import { EVACLineSubSegment } from './EVACLineSubSegment';
 export declare class EVACLineSegment extends ACLineSegment {
     lineSubSegments: Map<string, EVACLineSubSegment>;
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string, length?: number);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string, length?: number, aggregate?: boolean);
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
     static resolveClassFusekiJSON(data: any, cimModel: Model): void;

package/dist/model/extensions/enervance/wires/EVACLineSegment.js CHANGED Viewed

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EVACLineSegment = void 0;
 const ACLineSegment_1 = require("../../../wires/ACLineSegment");
 class EVACLineSegment extends ACLineSegment_1.ACLineSegment {
-    constructor(uuid, name, shortName, description, baseIRI, length) {
-        super(uuid, name, shortName, description, length);
+    constructor(uuid, name, shortName, description, baseIRI, length, aggregate) {
+        super(uuid, name, shortName, description, length, aggregate);
         this.lineSubSegments = new Map();
         this.baseIRI = baseIRI;
     }

package/dist/model/extensions/enervance/wires/EVACLineSegment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EVACLineSegment.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/wires/EVACLineSegment.ts"],"names":[],"mappings":";;;AAAA,gEAA2D;AAK3D,MAAa,eAAgB,SAAQ,6BAAa;IAIhD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB,EAAE,MAAe;~~QACnH~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;~~QAHpD~~,oBAAe,GAAoC,IAAI,GAAG,EAAE,CAAC;QAI3D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IA0CM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,eAAe,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,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,aAAa,GAAG,IAAI,eAAe,EAAE,CAAC;YAC5C,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACjD,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC3C,CAAC,EAAE;IACL,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAGM,iBAAiB,CAAC,cAAkC;QACzD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC;IACrE,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;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACjD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAClE,CAAC;IAEM,cAAc;QACnB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAiB,CAAC;QAC3E,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAIM,YAAY,CAAC,IAA+B;QACjD,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAiB,CAAC;QAC3E,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;;AAzGH,0CA2GC;AAlGe,2BAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsCrB,CAAA"}
1	+ {"version":3,"file":"EVACLineSegment.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/wires/EVACLineSegment.ts"],"names":[],"mappings":";;;AAAA,gEAA2D;AAK3D,MAAa,eAAgB,SAAQ,6BAAa;IAIhD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB,EAAE,MAAe,EAAE,SAAmB;QACxI,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAH/D,oBAAe,GAAoC,IAAI,GAAG,EAAE,CAAC;QAI3D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IA0CM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC3E;QACD,OAAO,eAAe,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,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,aAAa,GAAG,IAAI,eAAe,EAAE,CAAC;YAC5C,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACjD,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC3C,CAAC,EAAE;IACL,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAGM,iBAAiB,CAAC,cAAkC;QACzD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC;IACrE,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;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACjD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAClE,CAAC;IAEM,cAAc;QACnB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAiB,CAAC;QAC3E,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAIM,YAAY,CAAC,IAA+B;QACjD,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAiB,CAAC;QAC3E,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC7B,CAAC;;AAzGH,0CA2GC;AAlGe,2BAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsCrB,CAAA"}

package/dist/model/extensions/enervance/wires/EVACLineSubSegment.d.ts CHANGED Viewed

@@ -6,7 +6,7 @@ export declare class EVACLineSubSegment extends ACLineSegment {
     lineSegment: EVACLineSegment;
     lineSegmentUUID: string;
     number: string;
-    constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string, length?: number);
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string, baseIRI?: string, length?: number, aggregate?: boolean);
     static sparqlQuery: string;
     static getQuerySPARQL(graphURI: string): string;
     static resolveClassFusekiJSON(data: any, cimModel: Model): void;

package/dist/model/extensions/enervance/wires/EVACLineSubSegment.js CHANGED Viewed

@@ -4,8 +4,8 @@ exports.EVACLineSubSegment = void 0;
 const ACLineSegment_1 = require("../../../wires/ACLineSegment");
 const utils_1 = require("../../../../util/utils");
 class EVACLineSubSegment extends ACLineSegment_1.ACLineSegment {
-    constructor(uuid, name, shortName, description, baseIRI, length) {
-        super(uuid, name, shortName, description, length);
+    constructor(uuid, name, shortName, description, baseIRI, length, aggregate) {
+        super(uuid, name, shortName, description, length, aggregate);
         this.baseIRI = baseIRI;
     }
     static getQuerySPARQL(graphURI) {

package/dist/model/extensions/enervance/wires/EVACLineSubSegment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EVACLineSubSegment.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/wires/EVACLineSubSegment.ts"],"names":[],"mappings":";;;AAAA,~~gEAA6D~~;~~AAE7D~~,~~kDAAkD~~;~~AAKlD~~,MAAa,kBAAmB,SAAQ,6BAAa;IAQnD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB,EAAE,MAAe;~~QACnH~~,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;~~QAClD~~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"}
1	+ {"version":3,"file":"EVACLineSubSegment.js","sourceRoot":"","sources":["../../../../../src/model/extensions/enervance/wires/EVACLineSubSegment.ts"],"names":[],"mappings":";;;AAAA,gEAA2D;AAE3D,kDAAgD;AAKhD,MAAa,kBAAmB,SAAQ,6BAAa;IAQnD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,OAAgB,EAAE,MAAe,EAAE,SAAmB;QACxI,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC7D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAiCM,MAAM,CAAC,cAAc,CAAC,QAAgB;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,kBAAkB,CAAC,WAAW,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;SAC9E;QACD,OAAO,kBAAkB,CAAC,WAAW,CAAC;IACxC,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,aAAa,GAAG,IAAI,kBAAkB,EAAE,CAAC;YAC/C,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACjD,QAAQ,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;QAC9C,CAAC,EAAE;IACL,CAAC;IAES,2BAA2B,CAAC,KAAU;QAC9C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,gBAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,gBAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAEM,yBAAyB,CAAC,QAAe;QAC9C,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAoB,CAAC;QACtF,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAC1C;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,CAAC,IAAI,6BAA6B,CAAC,CAAC;SAC3E;IACH,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,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IACpC,CAAC;IAEM,kBAAkB;QACvB,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;SACtD;IACH,CAAC;IAKM,YAAY;;QAEjB,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,gBAAI,IAAI,CAAC,QAAQ,0CAAE,cAAc,0CAAE,MAAM,EAAE;YACzC,MAAM,UAAU,GAAe,EAAE,CAAC;YAClC,YAAA,IAAI,CAAC,QAAQ,0CAAE,cAAc,0CAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC/C,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,EAAE;oBAChD,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;iBACvD;YACH,CAAC,EAAE;YACH,IAAI,UAAU,CAAC,MAAM,EAAE;gBACrB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;gBAC5B,OAAO,CAAC,UAAU,CAAC,GAAG;oBACpB,IAAI,EAAE,YAAY;oBAClB,WAAW,EAAE,UAAU;iBACxB,CAAC;gBACF,OAAO,CAAC,YAAY,CAAC,GAAG;oBACtB,KAAK,EAAE,IAAI,CAAC,IAAI;oBAChB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,UAAU,EAAE,kBAAkB;iBAC/B,CAAA;aACF;SAEF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAGM,yBAAyB,CAAC,SAA8B;QAC7D,OAAO;IACT,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACzH,CAAC;IAED,cAAc,CAAC,WAA4B;QACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,aAAa,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACtI,CAAC;IAEM,wBAAwB;QAC7B,OAAO;eACI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI;;6CAEM,IAAI,CAAC,IAAI,KAAK,CAAC;IAC1D,CAAC;;AAnJH,gDAoJC;AAvIe,8BAAW,GAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA6BrB,CAAA"}

package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.d.ts ADDED Viewed

@@ -0,0 +1,9 @@
+import XMLWriter from 'xml-writer';
+import { EquivalentInjection } from '../../../equivalents/EquivalentInjection';
+export declare class INTEGRALEquivalentInjection extends EquivalentInjection {
+    rExt: number;
+    xExt: number;
+    constructor(uuid?: string, name?: string, shortName?: string, description?: string);
+    toCIMXML(xmlWriter: XMLWriter, profile: string): void;
+    protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
+}

package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js ADDED Viewed

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.INTEGRALEquivalentInjection = void 0;
+const rdf_xml_1 = require("../../../../constants/rdf-xml");
+const xml_serializer_1 = require("../../../../util/xml/xml.serializer");
+const xml_serializer_2 = require("../../../../util/xml/xml.serializer");
+const EquivalentInjection_1 = require("../../../equivalents/EquivalentInjection");
+class INTEGRALEquivalentInjection extends EquivalentInjection_1.EquivalentInjection {
+    constructor(uuid, name, shortName, description) {
+        super(uuid, name, shortName, description);
+    }
+    toCIMXML(xmlWriter, profile) {
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_SSH || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
+            const suffixID = this.getSuffixID(profile);
+            const prefixUUID = this.getPrefixUUID(suffixID);
+            xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'EquivalentInjection', rdf_xml_1.RDF_XML.CIM_NS_16);
+            xml_serializer_2.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
+            this.toCIMXMLAttributes(xmlWriter, profile);
+            this.toCIMXMLAssociations(xmlWriter, profile);
+            xmlWriter.endElement();
+        }
+    }
+    toCIMXMLAttributes(xmlWriter, profile) {
+        super.toCIMXMLAttributes(xmlWriter, profile);
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:EquivalentInjection.rExt`, this.rExt);
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:EquivalentInjection.xExt`, this.xExt);
+        }
+    }
+}
+exports.INTEGRALEquivalentInjection = INTEGRALEquivalentInjection;
+//# sourceMappingURL=INTEGRALEquivalentInjection.js.map

package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"INTEGRALEquivalentInjection.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,wEAAmE;AAEnE,wEAA4E;AAC5E,kFAA+E;AAE/E,MAAa,2BAA4B,SAAQ,yCAAmB;IAKlE,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,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,qBAAqB,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,aAAa,EAAE;YACrC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACxF,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;SACzF;IACH,CAAC;CAEF;AA9BD,kEA8BC"}

package/dist/model/extensions/integral/loadmodel/INTEGRALConformLoad.d.ts CHANGED Viewed

@@ -1,8 +1,9 @@
 import XMLWriter from 'xml-writer';
 import { ConformLoad } from '../../../loadmodel/ConformLoad';
-import { INTEGRALMultiplierFactor } from '../common/INTEGRALMultiplierFactor';
 export declare class INTEGRALConformLoad extends ConformLoad {
-    multiplierFactor: INTEGRALMultiplierFactor;
+    multiplierFactorUUID: string;
+    p_mf: number;
+    q_mf: number;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;

package/dist/model/extensions/integral/loadmodel/INTEGRALConformLoad.js CHANGED Viewed

@@ -22,9 +22,19 @@ class INTEGRALConformLoad extends ConformLoad_1.ConformLoad {
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
-            if (this.multiplierFactor) {
+            if (this.multiplierFactorUUID) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ConformLoad.MultiplierFactor', rdf_xml_1.RDF_XML.CIM_NS_16);
-                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.multiplierFactor.getUUID()}`);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.multiplierFactorUUID}`);
+                xmlWriter.endElement();
+            }
+            if (this.p_mf) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ConformLoad.p_mf', rdf_xml_1.RDF_XML.CIM_NS_16);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.p_mf}`);
+                xmlWriter.endElement();
+            }
+            if (this.q_mf) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ConformLoad.q_mf', rdf_xml_1.RDF_XML.CIM_NS_16);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.q_mf}`);
                 xmlWriter.endElement();
             }
         }

package/dist/model/extensions/integral/loadmodel/INTEGRALConformLoad.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"INTEGRALConformLoad.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/loadmodel/INTEGRALConformLoad.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,wEAA4E;AAC5E,gEAA6D;AAG7D,MAAa,mBAAoB,SAAQ,yBAAW;~~IAIlD~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACzG,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,aAAa,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAClF,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,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACrC,IAAI,IAAI,CAAC,~~gBAAgB~~,EAAE;~~gBACzB~~,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,8BAA8B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACnG,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,~~gBAAgB~~,CAAC,~~OAAO~~,EAAE,EAAE,CAAC,CAAC;~~gBACpH~~,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;SACF;IACH,CAAC;CAEF;~~AAhCD~~,~~kDAgCC~~"}
1	+ {"version":3,"file":"INTEGRALConformLoad.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/loadmodel/INTEGRALConformLoad.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,wEAA4E;AAC5E,gEAA6D;AAG7D,MAAa,mBAAoB,SAAQ,yBAAW;IAMlD,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACzG,MAAM,QAAQ,GAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,aAAa,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAClF,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,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACrC,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,8BAA8B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACnG,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;gBAC9G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,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,IAAI,EAAE,CAAC,CAAC;gBAC9F,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,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,IAAI,EAAE,CAAC,CAAC;gBAC9F,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;SACF;IACH,CAAC;CAEF;AA5CD,kDA4CC"}

package/dist/model/extensions/integral/wires/INTEGRALAsynchronousMachine.d.ts CHANGED Viewed

@@ -2,7 +2,11 @@ import XMLWriter from 'xml-writer';
 import { AsynchronousMachine } from '../../../wires/AsynchronousMachine';
 export declare class INTEGRALAsynchronousMachine extends AsynchronousMachine {
     multiplierFactorUUID: string;
+    p_mf: number;
+    q_mf: number;
+    nameprimaertyp: string;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
+    protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
 }

package/dist/model/extensions/integral/wires/INTEGRALAsynchronousMachine.js CHANGED Viewed

@@ -19,6 +19,12 @@ class INTEGRALAsynchronousMachine extends AsynchronousMachine_1.AsynchronousMach
             xmlWriter.endElement();
         }
     }
+    toCIMXMLAttributes(xmlWriter, profile) {
+        super.toCIMXMLAttributes(xmlWriter, profile);
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:AsynchronousMachine.nameprimaertyp`, this.nameprimaertyp);
+        }
+    }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
@@ -27,6 +33,16 @@ class INTEGRALAsynchronousMachine extends AsynchronousMachine_1.AsynchronousMach
                 xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.multiplierFactorUUID}`);
                 xmlWriter.endElement();
             }
+            if (this.p_mf) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'AsynchronousMachine.p_mf', rdf_xml_1.RDF_XML.CIM_NS_16);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.p_mf}`);
+                xmlWriter.endElement();
+            }
+            if (this.q_mf) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'AsynchronousMachine.q_mf', rdf_xml_1.RDF_XML.CIM_NS_16);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.q_mf}`);
+                xmlWriter.endElement();
+            }
         }
     }
 }

package/dist/model/extensions/integral/wires/INTEGRALAsynchronousMachine.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"INTEGRALAsynchronousMachine.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/wires/INTEGRALAsynchronousMachine.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,~~wEAA4E~~;~~AAC5E~~,4EAAyE;AAEzE,MAAa,2BAA4B,SAAQ,yCAAmB;~~IAIlE~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvG,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,qBAAqB,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;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACrC,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,sCAAsC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC3G,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;gBAC9G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;SACF;IACH,CAAC;CAEF;~~AAhCD~~,~~kEAgCC~~"}
1	+ {"version":3,"file":"INTEGRALAsynchronousMachine.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/wires/INTEGRALAsynchronousMachine.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,wEAA0F;AAC1F,4EAAyE;AAEzE,MAAa,2BAA4B,SAAQ,yCAAmB;IAOlE,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvG,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,qBAAqB,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;IACH,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAG,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACpC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,qCAAqC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;SAC7G;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACrC,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,sCAAsC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC3G,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;gBAC9G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,0BAA0B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC/F,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9F,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,0BAA0B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC/F,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9F,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;SACF;IACH,CAAC;CAEF;AApDD,kEAoDC"}

package/dist/model/extensions/integral/wires/INTEGRALExternalNetworkInjection.d.ts CHANGED Viewed

@@ -2,7 +2,13 @@ import XMLWriter from 'xml-writer';
 import { ExternalNetworkInjection } from '../../../wires/ExternalNetworkInjection';
 export declare class INTEGRALExternalNetworkInjection extends ExternalNetworkInjection {
     multiplierFactorUUID: string;
+    p_mf: number;
+    q_mf: number;
+    nameprimaertyp: string;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
+    setActivePower(arg0: number): void;
+    setReactivePower(arg0: number): void;
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
+    protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
 }

package/dist/model/extensions/integral/wires/INTEGRALExternalNetworkInjection.js CHANGED Viewed

@@ -8,6 +8,12 @@ class INTEGRALExternalNetworkInjection extends ExternalNetworkInjection_1.Extern
     constructor(uuid, name, shortName, description) {
         super(uuid, name, shortName, description);
     }
+    setActivePower(arg0) {
+        this.p = arg0;
+    }
+    setReactivePower(arg0) {
+        this.q = arg0;
+    }
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_SSH || profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
             const suffixID = this.getSuffixID(profile);
@@ -19,6 +25,12 @@ class INTEGRALExternalNetworkInjection extends ExternalNetworkInjection_1.Extern
             xmlWriter.endElement();
         }
     }
+    toCIMXMLAttributes(xmlWriter, profile) {
+        super.toCIMXMLAttributes(xmlWriter, profile);
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
+            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:ExternalNetworkInjection.nameprimaertyp`, this.nameprimaertyp);
+        }
+    }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
@@ -27,6 +39,16 @@ class INTEGRALExternalNetworkInjection extends ExternalNetworkInjection_1.Extern
                 xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.multiplierFactorUUID}`);
                 xmlWriter.endElement();
             }
+            if (this.p_mf) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ExternalNetworkInjection.p_mf', rdf_xml_1.RDF_XML.CIM_NS_16);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.p_mf}`);
+                xmlWriter.endElement();
+            }
+            if (this.q_mf) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ExternalNetworkInjection.q_mf', rdf_xml_1.RDF_XML.CIM_NS_16);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.q_mf}`);
+                xmlWriter.endElement();
+            }
         }
     }
 }

package/dist/model/extensions/integral/wires/INTEGRALExternalNetworkInjection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"INTEGRALExternalNetworkInjection.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/wires/INTEGRALExternalNetworkInjection.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,sFAAmF;AACnF,~~wEAA4E~~;~~AAE5E~~,MAAa,gCAAiC,SAAQ,mDAAwB;~~IAI5E~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvG,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,0BAA0B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC/F,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;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACrC,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,2CAA2C,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAChH,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;gBAC9G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;SACF;IACH,CAAC;CAEF;~~AAhCD~~,~~4EAgCC~~"}
1	+ {"version":3,"file":"INTEGRALExternalNetworkInjection.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/wires/INTEGRALExternalNetworkInjection.ts"],"names":[],"mappings":"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"}

package/dist/model/extensions/integral/wires/INTEGRALSynchronousMachine.d.ts CHANGED Viewed

@@ -2,6 +2,9 @@ import XMLWriter from 'xml-writer';
 import { SynchronousMachine } from '../../../wires/SynchronousMachine';
 export declare class INTEGRALSynchronousMachine extends SynchronousMachine {
     multiplierFactorUUID: string;
+    p_mf: number;
+    q_mf: number;
+    nameprimaertyp: string;
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;

package/dist/model/extensions/integral/wires/INTEGRALSynchronousMachine.js CHANGED Viewed

@@ -27,6 +27,16 @@ class INTEGRALSynchronousMachine extends SynchronousMachine_1.SynchronousMachine
                 xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.multiplierFactorUUID}`);
                 xmlWriter.endElement();
             }
+            if (this.p_mf) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'SynchronousMachine.p_mf', rdf_xml_1.RDF_XML.CIM_NS_16);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.p_mf}`);
+                xmlWriter.endElement();
+            }
+            if (this.q_mf) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'SynchronousMachine.q_mf', rdf_xml_1.RDF_XML.CIM_NS_16);
+                xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.q_mf}`);
+                xmlWriter.endElement();
+            }
         }
     }
 }

package/dist/model/extensions/integral/wires/INTEGRALSynchronousMachine.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"INTEGRALSynchronousMachine.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/wires/INTEGRALSynchronousMachine.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,wEAA4E;AAC5E,0EAAuE;AAEvE,MAAa,0BAA2B,SAAQ,uCAAkB;~~IAIhE~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvG,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,oBAAoB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YACzF,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;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACrC,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,qCAAqC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC1G,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;gBAC9G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;SACF;IACH,CAAC;CAEF;~~AAhCD~~,~~gEAgCC~~"}
1	+ {"version":3,"file":"INTEGRALSynchronousMachine.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/wires/INTEGRALSynchronousMachine.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,wEAA4E;AAC5E,0EAAuE;AAEvE,MAAa,0BAA2B,SAAQ,uCAAkB;IAMhE,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,IAAG,OAAO,KAAK,iBAAO,CAAC,UAAU,IAAI,OAAO,KAAK,iBAAO,CAAC,WAAW,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACvG,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,oBAAoB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YACzF,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;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACrC,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,qCAAqC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC1G,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;gBAC9G,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,yBAAyB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC9F,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9F,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;YACD,IAAI,IAAI,CAAC,IAAI,EAAE;gBACb,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,yBAAyB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC9F,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9F,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;SACF;IACH,CAAC;CAEF;AA5CD,gEA4CC"}

package/dist/model/extensions/neplan-westnetz/assets/WNFacility.js CHANGED Viewed

@@ -42,10 +42,10 @@ class WNFacility extends Facility_1.Facility {
         return WNFacility.sparqlQuery;
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   cim:Facility ;
-                cim:IdentifiedObject.name "Facility" .
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   cim:Facility ;
+                cim:IdentifiedObject.name "Facility" .
         `;
     }
     deleteConnectivityNode(icn) {
@@ -104,34 +104,34 @@ class WNFacility extends Facility_1.Facility {
     }
 }
 exports.WNFacility = WNFacility;
-WNFacility.sparqlQuery = `
-        PREFIX cim:	 		    <http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        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 apf:	 		    <http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:	 		    <http://jena.apache.org/ARQ/function#>
-        SELECT  (STRAFTER(str(?fUUID), '#_') AS ?uuid)
-                (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI)
-                ?name ?type ?kind ?installationDate
-                (strafter(strafter(str(?aiUUID), '#'), '_') AS ?assetInfoUUID)
-                (strafter(strafter(str(?acUUID), '#'), '_') AS ?assetContainerUUID)
-                (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)
-                (group_concat(STRAFTER(str(?cnUUIDs), '#_');separator=',') as ?connectivityNodeUUIDs)
-        WHERE {
-            GRAPH <http://default/>{
-                ?fUUID rdf:type cim:Facility .
-                OPTIONAL {?fUUID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?fUUID cim:Facility.kind ?kind .}
-                OPTIONAL {?fUUID cim:Asset.type ?type .}
-                OPTIONAL {?fUUID cim:Asset.lifecycleDate [ cim:LifecycleDate.installationDate ?installationDate ] .}
-                OPTIONAL {?fUUID cim:Asset.AssetInfo ?aiUUID .}
-                OPTIONAL {?fUUID cim:Asset.AssetContainer ?acUUID .}
-                OPTIONAL {?fUUID cim:Asset.PowerSystemResources ?psrUUIDs . }
-                OPTIONAL {?fUUID westnetzneplan:WNFacility.ConnectivityNodes ?cnUUIDs .}
-            }
-        }
+WNFacility.sparqlQuery = `
+        PREFIX cim:	 		    <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        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 apf:	 		    <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:	 		    <http://jena.apache.org/ARQ/function#>
+        SELECT  (STRAFTER(str(?fUUID), '#_') AS ?uuid)
+                (CONCAT(STRBEFORE(str(?fUUID), '#_'), '#_') AS ?baseIRI)
+                ?name ?type ?kind ?installationDate
+                (strafter(strafter(str(?aiUUID), '#'), '_') AS ?assetInfoUUID)
+                (strafter(strafter(str(?acUUID), '#'), '_') AS ?assetContainerUUID)
+                (group_concat(STRAFTER(str(?psrUUIDs), '#_');separator=',') as ?powerSystemResourceUUIDs)
+                (group_concat(STRAFTER(str(?cnUUIDs), '#_');separator=',') as ?connectivityNodeUUIDs)
+        WHERE {
+            GRAPH <http://default/>{
+                ?fUUID rdf:type cim:Facility .
+                OPTIONAL {?fUUID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?fUUID cim:Facility.kind ?kind .}
+                OPTIONAL {?fUUID cim:Asset.type ?type .}
+                OPTIONAL {?fUUID cim:Asset.lifecycleDate [ cim:LifecycleDate.installationDate ?installationDate ] .}
+                OPTIONAL {?fUUID cim:Asset.AssetInfo ?aiUUID .}
+                OPTIONAL {?fUUID cim:Asset.AssetContainer ?acUUID .}
+                OPTIONAL {?fUUID cim:Asset.PowerSystemResources ?psrUUIDs . }
+                OPTIONAL {?fUUID westnetzneplan:WNFacility.ConnectivityNodes ?cnUUIDs .}
+            }
+        }
         GROUP BY ?fUUID ?baseIRI ?name ?type ?kind ?installationDate ?aiUUID ?acUUID `;
 //# sourceMappingURL=WNFacility.js.map

package/dist/model/extensions/neplan-westnetz/assets/WNWireInfo.js CHANGED Viewed

@@ -52,45 +52,45 @@ class WNWireInfo extends EVWireInfo_1.EVWireInfo {
     }
 }
 exports.WNWireInfo = WNWireInfo;
-WNWireInfo.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/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)
-                ?name ?r0 ?x0 ?c0 ?r1 ?x1 ?c1 ?b ?g ?sizeDescription ?strandCount
-                ?ratedCurrent ?voltage ?type ?failureProbability ?insulation
-                ?issue ?category
-        WHERE {
-            GRAPH <http://default/>{
-                ?MRID rdf:type cim:WireInfo .
-                OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
-                OPTIONAL {?MRID cim:WireInfo.ratedCurrent ?ratedCurrent .}
-                OPTIONAL {?MRID enervance:EVWireInfo.r0 ?r0 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.x0 ?x0 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.c0 ?c0 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.r1 ?r1 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.x1 ?x1 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.c1 ?c1 .}
-                OPTIONAL {?MRID enervance:EVWireInfo.b ?b .}
-                OPTIONAL {?MRID enervance:EVWireInfo.g ?g .}
-                OPTIONAL {?MRID cim:WireInfo.sizeDescription ?sizeDescription .}
-                OPTIONAL {?MRID enervance:EVWireInfo.strandCount ?strandCount  .}
-                OPTIONAL {?MRID enervance:EVWireInfo.voltage ?voltage .}
-                OPTIONAL {?MRID enervance:EVWireInfo.failureProbability ?failureProbability .}
-                OPTIONAL {?MRID enervance:EVWireInfo.insulation ?insulation .}
-                OPTIONAL {?MRID enervance:EVWireInfo.type ?type .}
-                OPTIONAL {?MRID westnetzneplan:WNWireInfo.issue ?issue  .}
-                OPTIONAL {?MRID westnetzneplan:WNWireInfo.category ?category  .}
-            }
-        }
+WNWireInfo.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/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)
+                ?name ?r0 ?x0 ?c0 ?r1 ?x1 ?c1 ?b ?g ?sizeDescription ?strandCount
+                ?ratedCurrent ?voltage ?type ?failureProbability ?insulation
+                ?issue ?category
+        WHERE {
+            GRAPH <http://default/>{
+                ?MRID rdf:type cim:WireInfo .
+                OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
+                OPTIONAL {?MRID cim:WireInfo.ratedCurrent ?ratedCurrent .}
+                OPTIONAL {?MRID enervance:EVWireInfo.r0 ?r0 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.x0 ?x0 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.c0 ?c0 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.r1 ?r1 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.x1 ?x1 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.c1 ?c1 .}
+                OPTIONAL {?MRID enervance:EVWireInfo.b ?b .}
+                OPTIONAL {?MRID enervance:EVWireInfo.g ?g .}
+                OPTIONAL {?MRID cim:WireInfo.sizeDescription ?sizeDescription .}
+                OPTIONAL {?MRID enervance:EVWireInfo.strandCount ?strandCount  .}
+                OPTIONAL {?MRID enervance:EVWireInfo.voltage ?voltage .}
+                OPTIONAL {?MRID enervance:EVWireInfo.failureProbability ?failureProbability .}
+                OPTIONAL {?MRID enervance:EVWireInfo.insulation ?insulation .}
+                OPTIONAL {?MRID enervance:EVWireInfo.type ?type .}
+                OPTIONAL {?MRID westnetzneplan:WNWireInfo.issue ?issue  .}
+                OPTIONAL {?MRID westnetzneplan:WNWireInfo.category ?category  .}
+            }
+        }
     `;
 //# sourceMappingURL=WNWireInfo.js.map