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

@enervance/insight-cim-model 0.0.47 → 0.0.48

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 (179) hide show

package/dist/model/extensions/amprion/core/AMPRIONLine.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AMPRIONLine.js","sourceRoot":"","sources":["../../../../../src/model/extensions/amprion/core/AMPRIONLine.ts"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,kDAA+D;AAC/D,2DAAwD;AAGxD,wEAAmE;AAEnE,MAAa,WAAY,SAAQ,WAAI;~~IAInC~~,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,GAAY;QAC9F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,MAAM,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC3E,6BAAqB,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;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YAC5C,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,MAAM,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC3E,6BAAqB,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,uBAAuB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;SACpF;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,OAAO,aAAa,CAAC;IACvB,CAAC;;~~AA5CH~~,~~kCAqEC~~;AAtBe,uBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;KAqBjC,CAAC"}
1	+ {"version":3,"file":"AMPRIONLine.js","sourceRoot":"","sources":["../../../../../src/model/extensions/amprion/core/AMPRIONLine.ts"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,kDAA+D;AAC/D,2DAAwD;AAGxD,wEAAmE;AAEnE,MAAa,WAAY,SAAQ,WAAI;IAKnC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB,EAAE,GAAY;QAC9F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAGM,QAAQ,CAAC,SAAoB,EAAE,OAAe;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,MAAM,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC3E,6BAAqB,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;aAAM,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YAC5C,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,MAAM,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC3E,6BAAqB,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,uBAAuB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;SACpF;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,gCAAgC,CAAC,mBAAyC;QACxE,IAAI,aAAa,GAAG,KAAK,CAAC,gCAAgC,CAAC,mBAAmB,CAAC,CAAC;QAChF,OAAO,aAAa,CAAC;IACvB,CAAC;;AA7CH,kCAsEC;AAtBe,uBAAW,GAAW;;;;;;;;;;;;;;;;;;;;;KAqBjC,CAAC"}

package/dist/model/extensions/amprion/core/AMPRIONSubstation.js CHANGED Viewed

@@ -70,30 +70,30 @@ class AMPRIONSubstation extends Substation_1.Substation {
     }
 }
 exports.AMPRIONSubstation = AMPRIONSubstation;
-AMPRIONSubstation.sparqlQuery = `
-        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#>
-        PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#>
-        PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        PREFIX amp:         <http://amprion.net/CIM/Extensions#>
-        PREFIX apf:         <http://jena.hpl.hp.com/ARQ/property#>
-        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
-        SELECT  (STRAFTER(str(?mrid), '#_') AS ?uuid)
-        ?name ?shortName ?description ?isVirtual
-        (STRAFTER(str(?lUUID), '#_') AS ?locationUUID)
-        ?number
-        WHERE {
-          GRAPH <http://default/> {
-            ?mrid rdf:type cim:Substation .
-            OPTIONAL { ?mrid cim:IdentifiedObject.name ?name .}
-            OPTIONAL { ?mrid entsoe:IdentifiedObject.shortName ?shortName .}
-            OPTIONAL { ?mrid cim:IdentifiedObject.description ?description .}
-            OPTIONAL { ?mrid amp:Substation.number ?number .}
-            OPTIONAL { ?mrid amp:EquipmentContainer.isVirtual ?isVirtual .}
-            OPTIONAL { ?mrid cim:PowerSystemResource.Location ?lUUID . }
-          }
-        }
+AMPRIONSubstation.sparqlQuery = `
+        PREFIX cim:         <http://iec.ch/TC57/2013/CIM-schema-cim16#>
+        PREFIX entsoe:      <http://entsoe.eu/CIM/SchemaExtension/3/1#>
+        PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX amp:         <http://amprion.net/CIM/Extensions#>
+        PREFIX apf:         <http://jena.hpl.hp.com/ARQ/property#>
+        PREFIX afn:         <http://jena.apache.org/ARQ/function#>
+        SELECT  (STRAFTER(str(?mrid), '#_') AS ?uuid)
+        ?name ?shortName ?description ?isVirtual
+        (STRAFTER(str(?lUUID), '#_') AS ?locationUUID)
+        ?number
+        WHERE {
+          GRAPH <http://default/> {
+            ?mrid rdf:type cim:Substation .
+            OPTIONAL { ?mrid cim:IdentifiedObject.name ?name .}
+            OPTIONAL { ?mrid entsoe:IdentifiedObject.shortName ?shortName .}
+            OPTIONAL { ?mrid cim:IdentifiedObject.description ?description .}
+            OPTIONAL { ?mrid amp:Substation.number ?number .}
+            OPTIONAL { ?mrid amp:EquipmentContainer.isVirtual ?isVirtual .}
+            OPTIONAL { ?mrid cim:PowerSystemResource.Location ?lUUID . }
+          }
+        }
     `;
 //# sourceMappingURL=AMPRIONSubstation.js.map

package/dist/model/extensions/amprion/project/AMPRIONConstructionProject.js CHANGED Viewed

@@ -71,11 +71,11 @@ AMPRIONConstructionProject.sparqlQuery = `
         (STRAFTER(STRAFTER(str(?prio), '#'), '.') AS ?priority)
         ?accountablePerson ?accountableDepartment ?number
-        ?state ?projectPhase
+        ?state ?projectPhase ?type
         ?variationProject ?prospectiveDepartment ?prospectiveAccountableDepartment
         ?NEPState ?NEPProject ?investmentApplicationState ?externalParticipants ?externalContact
-        ?ENLAGProject ?billingContact ?BBPIGState ?BBPIGProject
+        ?ENLAGProject ?billingContact ?BBPIGState ?BBPIGProject
         ?affectedAssetGroups ?planCostsWithoutBGK ?planCostsWithBGK
         (STRAFTER(str(?bUUID), '#_') AS ?bundleUUID)
         (STRAFTER(str(?pUUID), '#_') AS ?planUUID)
@@ -95,6 +95,7 @@ AMPRIONConstructionProject.sparqlQuery = `
                 OPTIONAL{?MRID amp:AMPRIONErpProjectStructure.number ?number .}
                 OPTIONAL{?MRID amp:AMPRIONErpProjectStructure.state ?state .}
                 OPTIONAL{?MRID amp:AMPRIONErpProjectStructure.projectPhase ?projectPhase .}
+                OPTIONAL{?MRID amp:AMPRIONErpProjectStructure.type ?type .}
                 #AMPRIONErpProject
                 OPTIONAL{?MRID amp:AMPRIONErpProject.applicant ?applicant .}
@@ -126,7 +127,7 @@ AMPRIONConstructionProject.sparqlQuery = `
     GROUP BY ?MRID ?name ?shortName ?description
             ?applicant ?projectGroup
             ?accountablePerson ?accountableDepartment ?number
-            ?state ?projectPhase ?prio
+            ?state ?projectPhase ?prio ?type
             ?variationProject ?prospectiveDepartment ?prospectiveAccountableDepartment
             ?NEPState ?NEPProject ?investmentApplicationState ?externalParticipants ?externalContact
             ?ENLAGProject ?billingContact ?BBPIGState ?BBPIGProject

package/dist/model/extensions/amprion/project/AMPRIONConstructionProject.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AMPRIONConstructionProject.js","sourceRoot":"","sources":["../../../../../src/model/extensions/amprion/project/AMPRIONConstructionProject.ts"],"names":[],"mappings":"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~~gEAuKC~~;~~AA9Ee~~,sCAAW,GAAW~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA4E7B~~,CAAC"}
1	+ {"version":3,"file":"AMPRIONConstructionProject.js","sourceRoot":"","sources":["../../../../../src/model/extensions/amprion/project/AMPRIONConstructionProject.ts"],"names":[],"mappings":"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"}

package/dist/model/extensions/amprion/project/AMPRIONErpProjectStructure.d.ts CHANGED Viewed

@@ -7,6 +7,7 @@ export declare abstract class AMPRIONErpProjectStructure extends IdentifiedObjec
     number: string;
     state: string;
     projectPhase: string;
+    type: string;
     projectPhases: Map<string, AMPRIONErpProjectPhase>;
     protected constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     addProjectPhase(phase: AMPRIONErpProjectPhase): void;

package/dist/model/extensions/amprion/project/AMPRIONErpProjectStructure.js CHANGED Viewed

@@ -17,6 +17,7 @@ class AMPRIONErpProjectStructure extends IdentifiedObject_1.IdentifiedObject {
         this.accountablePerson = utils_1.getValue(value, 'accountablePerson');
         this.accountableDepartment = utils_1.getValue(value, 'accountableDepartment');
         this.number = utils_1.getValue(value, 'number');
+        this.type = utils_1.getValue(value, 'type');
         this.state = utils_1.getValue(value, 'state');
         this.projectPhase = utils_1.getValue(value, 'projectPhase');
     }

package/dist/model/extensions/amprion/project/AMPRIONErpProjectStructure.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AMPRIONErpProjectStructure.js","sourceRoot":"","sources":["../../../../../src/model/extensions/amprion/project/AMPRIONErpProjectStructure.ts"],"names":[],"mappings":";;;AAAA,~~qEAAgE~~;~~AAEhE~~,~~kDAAgD~~;~~AAEhD~~,MAAsB,0BAA2B,SAAQ,mCAAgB;IAWvE,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAH5C,kBAAa,GAAwC,IAAI,GAAG,EAAE,CAAC;IAI/D,CAAC;IAED,eAAe,CAAC,KAA6B;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,gBAAQ,CAAC,KAAK,EAAE,UAAU,CAAqC,CAAC;QAChF,IAAI,CAAC,iBAAiB,GAAG,gBAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QAC9D,IAAI,CAAC,qBAAqB,GAAG,gBAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,GAAG,gBAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,gBAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACtC,IAAI,CAAC,YAAY,GAAG,gBAAQ,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACtD,CAAC;CACF;~~AA5BD~~,~~gEA4BC~~"}
1	+ {"version":3,"file":"AMPRIONErpProjectStructure.js","sourceRoot":"","sources":["../../../../../src/model/extensions/amprion/project/AMPRIONErpProjectStructure.ts"],"names":[],"mappings":";;;AAAA,qEAAkE;AAElE,kDAAkD;AAElD,MAAsB,0BAA2B,SAAQ,mCAAgB;IAWvE,YAAsB,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC1F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAH5C,kBAAa,GAAwC,IAAI,GAAG,EAAE,CAAC;IAI/D,CAAC;IAED,eAAe,CAAC,KAA6B;QAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,gBAAQ,CAAC,KAAK,EAAE,UAAU,CAAqC,CAAC;QAChF,IAAI,CAAC,iBAAiB,GAAG,gBAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QAC9D,IAAI,CAAC,qBAAqB,GAAG,gBAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,GAAG,gBAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,GAAG,gBAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,gBAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACtC,IAAI,CAAC,YAAY,GAAG,gBAAQ,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACtD,CAAC;CACF;AA7BD,gEA6BC"}

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/EVACLineSubSegment.js CHANGED Viewed

@@ -91,41 +91,41 @@ class EVACLineSubSegment extends ACLineSegment_1.ACLineSegment {
         return this.getAssociationSparqlTriple(this.baseIRI, this.mrid, 'enervance', 'EVACLineSubSegment', 'LineSegment', lineSegment.mrid);
     }
     createNewStatementSPARQL() {
-        return `
-            <${this.baseIRI}${this.mrid}>
-            a   enervance:EVACLineSubSegment ;
+        return `
+            <${this.baseIRI}${this.mrid}>
+            a   enervance:EVACLineSubSegment ;
                 cim:IdentifiedObject.name '${this.name}' .`;
     }
 }
 exports.EVACLineSubSegment = EVACLineSubSegment;
-EVACLineSubSegment.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 ?shortName ?description ?length ?number ?r ?x ?maxRatedCurrent
-                        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID)
-                        (strafter(strafter(str(?lsUUID), '#'), '_') AS ?lineSegmentUUID)
-                WHERE {
-                    GRAPH <http://default/>{
-                        ?MRID rdf:type enervance:EVACLineSubSegment .
-                        OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
-                        OPTIONAL {?MRID entsoe:IdentifiedObject.shortName ?shortName .}
-                        OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
-                        OPTIONAL {?MRID cim:Conductor.length ?length .}
-                        OPTIONAL {?MRID cim:ACLineSegment.r ?r .}
-                        OPTIONAL {?MRID cim:ACLineSegment.x ?x .}
-                        OPTIONAL {?MRID enervance:EVACLineSubSegment.number ?number .}
-                        OPTIONAL {?MRID enervance:EVACLineSubSegment.maxRatedCurrent ?maxRatedCurrent .}
-                        OPTIONAL {?MRID cim:PowerSystemResource.PSRType ?ptUUID .}
-                        OPTIONAL {?MRID enervance:EVACLineSubSegment.LineSegment ?lsUUID .}
-                    }
-                }
+EVACLineSubSegment.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 ?shortName ?description ?length ?number ?r ?x ?maxRatedCurrent
+                        (strafter(strafter(str(?ptUUID), '#'), '_') AS ?psrTypeUUID)
+                        (strafter(strafter(str(?lsUUID), '#'), '_') AS ?lineSegmentUUID)
+                WHERE {
+                    GRAPH <http://default/>{
+                        ?MRID rdf:type enervance:EVACLineSubSegment .
+                        OPTIONAL {?MRID cim:IdentifiedObject.name ?name .}
+                        OPTIONAL {?MRID entsoe:IdentifiedObject.shortName ?shortName .}
+                        OPTIONAL {?MRID cim:IdentifiedObject.description ?description .}
+                        OPTIONAL {?MRID cim:Conductor.length ?length .}
+                        OPTIONAL {?MRID cim:ACLineSegment.r ?r .}
+                        OPTIONAL {?MRID cim:ACLineSegment.x ?x .}
+                        OPTIONAL {?MRID enervance:EVACLineSubSegment.number ?number .}
+                        OPTIONAL {?MRID enervance:EVACLineSubSegment.maxRatedCurrent ?maxRatedCurrent .}
+                        OPTIONAL {?MRID cim:PowerSystemResource.PSRType ?ptUUID .}
+                        OPTIONAL {?MRID enervance:EVACLineSubSegment.LineSegment ?lsUUID .}
+                    }
+                }
                 `;
 //# sourceMappingURL=EVACLineSubSegment.js.map

package/dist/model/extensions/integral/common/INTEGRALMultiplierFactor.js CHANGED Viewed

@@ -10,7 +10,7 @@ class INTEGRALMultiplierFactor extends IdentifiedObject_1.IdentifiedObject {
     }
     toCIMXML(xmlWriter, profile) {
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7 && this.checkExportData(rdf_xml_1.RDF_XML.PROFILE_AMPI7)) {
-            xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'Multiplikationsfaktor', rdf_xml_1.RDF_XML.CIM_NS_16);
+            xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'INTEGRALMultiplierFactor', rdf_xml_1.RDF_XML.CIM_NS_16);
             xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_ID, `${rdf_xml_1.RDF_XML.UNDERSCORE}${this.mrid}`);
             this.toCIMXMLAttributes(xmlWriter, profile);
             this.toCIMXMLAssociations(xmlWriter, profile);
@@ -20,18 +20,28 @@ class INTEGRALMultiplierFactor extends IdentifiedObject_1.IdentifiedObject {
     toCIMXMLAttributes(xmlWriter, profile) {
         super.toCIMXMLAttributes(xmlWriter, undefined);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7 && this.checkExportData(rdf_xml_1.RDF_XML.PROFILE_AMPI7)) {
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:Multiplikationsfaktor.p`, this.p);
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:Multiplikationsfaktor.q_ind`, this.qInd);
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:Multiplikationsfaktor.q_kap`, this.qKap);
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:Multiplikationsfaktor.cos_phi_ind`, this.cosPhiInd);
-            xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:Multiplikationsfaktor.cos_phi_kap`, this.cosPhiKap);
+            if (this.p != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:INTEGRALMultiplierFactor.p`, this.p);
+            }
+            if (this.qInd != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:INTEGRALMultiplierFactor.q_ind`, this.qInd);
+            }
+            if (this.qKap != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:INTEGRALMultiplierFactor.q_kap`, this.qKap);
+            }
+            if (this.cosPhiInd != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:INTEGRALMultiplierFactor.cos_phi_ind`, this.cosPhiInd);
+            }
+            if (this.cosPhiKap != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:INTEGRALMultiplierFactor.cos_phi_kap`, this.cosPhiKap);
+            }
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
     }
     checkExportData(profilURI) {
-        if (this.p || this.qInd || this.qKap || this.cosPhiInd || this.cosPhiKap) {
+        if (this.p !== undefined || this.qInd !== undefined || this.qKap !== undefined || this.cosPhiInd !== undefined || this.cosPhiKap !== undefined) {
             return true;
         }
         else {

package/dist/model/extensions/integral/common/INTEGRALMultiplierFactor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"INTEGRALMultiplierFactor.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/common/INTEGRALMultiplierFactor.ts"],"names":[],"mappings":";;;AAAA,2DAAsD;AAEtD,wEAA0F;AAC1F,qEAAkE;AAElE,MAAa,wBAAyB,SAAQ,mCAAgB;IAS5D,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,aAAa,IAAI,IAAI,CAAC,eAAe,CAAC,iBAAO,CAAC,aAAa,CAAC,EAAE;YACpF,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,~~uBAAuB~~,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;~~YAC5F~~,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,MAAM,EAAE,GAAG,iBAAO,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,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,SAAS,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,eAAe,CAAC,iBAAO,CAAC,aAAa,CAAC,EAAE;YACpF,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,~~0BAA0B~~,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;~~YACpF~~,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,~~8BAA8B~~,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;~~YAC3F~~,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,~~8BAA8B~~,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;~~YAC3F~~,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,~~oCAAoC~~,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;~~YACtG~~,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,~~oCAAoC~~,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;~~SACvG~~;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAKD,eAAe,CAAC,SAAiB;QAC/B,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE;~~YACxE~~,OAAO,IAAI,CAAC;SACb;aAAI;YACH,OAAO,KAAK,CAAC;SACd;IACH,CAAC;CACF;~~AAjDD~~,~~4DAiDC~~"}
1	+ {"version":3,"file":"INTEGRALMultiplierFactor.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/common/INTEGRALMultiplierFactor.ts"],"names":[],"mappings":";;;AAAA,2DAAsD;AAEtD,wEAA0F;AAC1F,qEAAkE;AAElE,MAAa,wBAAyB,SAAQ,mCAAgB;IAS5D,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,aAAa,IAAI,IAAI,CAAC,eAAe,CAAC,iBAAO,CAAC,aAAa,CAAC,EAAE;YACpF,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,0BAA0B,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAC/F,sCAAqB,CAAC,SAAS,EAAE,iBAAO,CAAC,MAAM,EAAE,GAAG,iBAAO,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,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,SAAS,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,aAAa,IAAI,IAAI,CAAC,eAAe,CAAC,iBAAO,CAAC,aAAa,CAAC,EAAE;YACpF,IAAG,IAAI,CAAC,CAAC,IAAI,SAAS,EAAC;gBACrB,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,6BAA6B,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;aACxF;YACD,IAAG,IAAI,CAAC,IAAI,IAAI,SAAS,EAAC;gBACxB,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,iCAAiC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC/F;YACD,IAAG,IAAI,CAAC,IAAI,IAAI,SAAS,EAAC;gBACxB,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,iCAAiC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC/F;YACD,IAAG,IAAI,CAAC,SAAS,IAAI,SAAS,EAAC;gBAC7B,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uCAAuC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;aAC1G;YACD,IAAG,IAAI,CAAC,SAAS,IAAI,SAAS,EAAC;gBAC7B,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,uCAAuC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;aAC1G;SACF;IACH,CAAC;IAES,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAKD,eAAe,CAAC,SAAiB;QAC/B,IAAI,IAAI,CAAC,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;YAC9I,OAAO,IAAI,CAAC;SACb;aAAI;YACH,OAAO,KAAK,CAAC;SACd;IACH,CAAC;CACF;AA3DD,4DA2DC"}

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

@@ -7,4 +7,5 @@ export declare class INTEGRALConformLoad extends ConformLoad {
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
+    protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
 }

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

@@ -22,20 +22,21 @@ class INTEGRALConformLoad extends ConformLoad_1.ConformLoad {
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
-            if (this.multiplierFactorUUID) {
-                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ConformLoad.MultiplierFactor', rdf_xml_1.RDF_XML.CIM_NS_16);
+            if (this.multiplierFactorUUID != undefined) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ConformLoad.INTEGRALMultiplierFactor', 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.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();
+        }
+    }
+    toCIMXMLAttributes(xmlWriter, profile) {
+        super.toCIMXMLAttributes(xmlWriter, profile);
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
+            if (this.p_mf != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:ConformLoad.p_mf`, this.p_mf);
             }
-            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();
+            if (this.q_mf != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:ConformLoad.q_mf`, this.q_mf);
             }
         }
     }

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;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~~"}
1	+ {"version":3,"file":"INTEGRALConformLoad.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/loadmodel/INTEGRALConformLoad.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,wEAA0F;AAC1F,gEAA6D;AAE7D,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,IAAI,SAAS,EAAE;gBAC1C,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;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,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE;gBAC1B,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aACjF;YACD,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE;gBAC1B,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aACjF;SACF;IACH,CAAC;CAEF;AA9CD,kDA8CC"}

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

@@ -23,7 +23,7 @@ class INTEGRALACLineSegment extends ACLineSegment_1.ACLineSegment {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
             if (this.multiplierFactorUUID) {
-                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ACLineSegment.MultiplierFactor', rdf_xml_1.RDF_XML.CIM_NS_16);
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ACLineSegment.INTEGRALMultiplierFactor', 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.multiplierFactorUUID}`);
                 xmlWriter.endElement();
             }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"INTEGRALACLineSegment.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/wires/INTEGRALACLineSegment.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,wEAA4E;AAC5E,gEAA6D;AAE7D,MAAa,qBAAsB,SAAQ,6BAAa;IAItD,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,eAAe,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YACpF,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,~~gCAAgC~~,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;~~gBACrG~~,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,sDAgCC"}
1	+ {"version":3,"file":"INTEGRALACLineSegment.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/wires/INTEGRALACLineSegment.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,wEAA4E;AAC5E,gEAA6D;AAE7D,MAAa,qBAAsB,SAAQ,6BAAa;IAItD,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,eAAe,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YACpF,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,wCAAwC,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC7G,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,sDAgCC"}

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

@@ -22,27 +22,25 @@ class INTEGRALAsynchronousMachine extends AsynchronousMachine_1.AsynchronousMach
     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);
+            if (this.nameprimaertyp != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:AsynchronousMachine.nameprimaertyp`, this.nameprimaertyp);
+            }
+            if (this.p_mf != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:AsynchronousMachine.p_mf`, this.p_mf);
+            }
+            if (this.q_mf != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:AsynchronousMachine.q_mf`, this.q_mf);
+            }
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
-            if (this.multiplierFactorUUID) {
+            if (this.multiplierFactorUUID != undefined) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'AsynchronousMachine.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.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,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~~"}
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;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,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,IAAG,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACpC,IAAG,IAAI,CAAC,cAAc,IAAI,SAAS,EAAC;gBAClC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,qCAAqC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;aAC7G;YACD,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE;gBAC1B,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aACzF;YACD,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE;gBAC1B,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,2BAA2B,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aACzF;SACF;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,IAAI,SAAS,EAAE;gBAC1C,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;AAlDD,kEAkDC"}

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

@@ -28,27 +28,25 @@ class INTEGRALExternalNetworkInjection extends ExternalNetworkInjection_1.Extern
     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);
+            if (this.nameprimaertyp != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:ExternalNetworkInjection.nameprimaertyp`, this.nameprimaertyp);
+            }
+            if (this.p_mf != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:ExternalNetworkInjection.p_mf`, this.p_mf);
+            }
+            if (this.q_mf != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:ExternalNetworkInjection.q_mf`, this.q_mf);
+            }
         }
     }
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
-            if (this.multiplierFactorUUID) {
-                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ExternalNetworkInjection.MultiplierFactor', rdf_xml_1.RDF_XML.CIM_NS_16);
+            if (this.multiplierFactorUUID != undefined) {
+                xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'ExternalNetworkInjection.INTEGRALMultiplierFactor', 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.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,wEAA0F;AAE1F,MAAa,gCAAiC,SAAQ,mDAAwB;IAO5E,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,cAAc,CAAC,IAAY;QACzB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAChB,CAAC;~~IAED~~,gBAAgB,CAAC,IAAY;QAC3B,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAChB,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,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,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,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,0CAA0C,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;~~SAClH~~;~~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~~;~~YACD~~,~~IAAI,IAAI,~~CAAC~~,IAAI,EAAE~~;~~gBACb~~,~~SAAS~~,CAAC,~~cAAc~~,~~CAAC,iBAAO,CAAC,aAAa,~~EAAE~~,+BAA+B~~,~~EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC~~;~~gBACpG~~,~~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~~,+BAA+B~~,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;~~gBACpG~~,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;~~AA5DD~~,~~4EA4DC~~"}
1	+ {"version":3,"file":"INTEGRALExternalNetworkInjection.js","sourceRoot":"","sources":["../../../../../src/model/extensions/integral/wires/INTEGRALExternalNetworkInjection.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGxD,sFAAmF;AACnF,wEAA0F;AAE1F,MAAa,gCAAiC,SAAQ,mDAAwB;IAO5E,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAChF,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,cAAc,CAAC,IAAY;QACzB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAChB,CAAC;IACD,gBAAgB,CAAC,IAAY;QAC3B,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAChB,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,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,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,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAChE,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAG,OAAO,KAAK,iBAAO,CAAC,aAAa,EAAE;YACpC,IAAG,IAAI,CAAC,cAAc,IAAI,SAAS,EAAC;gBAClC,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,0CAA0C,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;aAClH;YACD,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE;gBAC1B,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,gCAAgC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9F;YACD,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE;gBAC1B,6BAAY,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,aAAa,gCAAgC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9F;SACF;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,IAAI,SAAS,EAAE;gBAC1C,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,mDAAmD,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBACxH,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;AAzDD,4EAyDC"}

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

@@ -8,4 +8,5 @@ export declare class INTEGRALSynchronousMachine extends SynchronousMachine {
     constructor(uuid?: string, name?: string, shortName?: string, description?: string);
     toCIMXML(xmlWriter: XMLWriter, profile: string): void;
     protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
+    protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
 }

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

@@ -22,20 +22,21 @@ class INTEGRALSynchronousMachine extends SynchronousMachine_1.SynchronousMachine
     toCIMXMLAssociations(xmlWriter, profile) {
         super.toCIMXMLAssociations(xmlWriter, profile);
         if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
-            if (this.multiplierFactorUUID) {
+            if (this.multiplierFactorUUID != undefined) {
                 xmlWriter.startElementNS(rdf_xml_1.RDF_XML.FGH_NS_PREFIX, 'SynchronousMachine.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.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();
+        }
+    }
+    toCIMXMLAttributes(xmlWriter, profile) {
+        super.toCIMXMLAttributes(xmlWriter, profile);
+        if (profile === rdf_xml_1.RDF_XML.PROFILE_AMPI7) {
+            if (this.p_mf != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:SynchronousMachine.p_mf`, this.p_mf);
             }
-            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();
+            if (this.q_mf != undefined) {
+                xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.FGH_NS_PREFIX}:SynchronousMachine.q_mf`, this.q_mf);
             }
         }
     }