@enervance/insight-cim-model 0.0.199 → 0.0.200

package/dist/converter/integral7/converter.integral7.js

@@ -287,7 +287,6 @@ class ConverterIntegral7 {
         });
     }
     convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const integral7Modell = frame.getI7Model();
             const cimModel = frame.cimModel;
@@ -597,10 +596,10 @@ class ConverterIntegral7 {
                             // const diagramObject = resultingObject as DiagramObject;
                             const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObject, this.configUuid, currentDiagramObject.getIdentifiedObjectUUID());
                             currentDiagramObject.mrid = uuid;
-                            for (const diagramObjectPoint of currentDiagramObject.diagramObjectPoints) {
-                                const key = uuid + String((_a = diagramObjectPoint.sequenceNumber) !== null && _a !== void 0 ? _a : 1);
+                            for (let a = 0; a < currentDiagramObject.diagramObjectPoints.length; ++a) {
+                                const key = `${uuid}${a + 1}`;
                                 const pointUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObjectPoint, this.configUuid, key);
-                                diagramObjectPoint.mrid = pointUuid;
+                                currentDiagramObject.diagramObjectPoints[a].mrid = pointUuid;
                             }
                             frame.cimModel.addDiagramObject(currentDiagramObject);
                         }
@@ -938,7 +937,7 @@ class ConverterIntegral7 {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid);
                     // const vl = new VoltageLevel(getUUID(i7Data.guid_v, this.objectMappingConfig.standardiseUuid), createNotation([getName(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
-                    const vl = new VoltageLevel_1.VoltageLevel(common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.VoltageLevel, this.configUuid, rdfid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', i7Data.un.toString(), '_VL']), i7Data.kurzname);
+                    const vl = new VoltageLevel_1.VoltageLevel(common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.VoltageLevel, this.configUuid, rdfid), i7Data.bezeichner, i7Data.kurzname);
                     //const rdfid = getUUID(i7Data.guid); /**This is the mrid for TopologicalNode */
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, i7Data.bezeichner, i7Data.kurzname, i7Data.kommentar);
                     connectivityNode.setConnectivityNodeContainer(vl);
@@ -1064,9 +1063,7 @@ class ConverterIntegral7 {
                 const result = yield this.queryDataInChuncks(integral_sql_1.I7Objects.KNOTEN_SF, schaltfeldIDs);
                 for (const i7Data of result) {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.schaltfeld));
-                    /*        const key = I7Objects.KNOTEN_SF + (bay?.getUUID() ?? '') + String(i7Data.id) + String(i7Data.schaltfeld);
-                            const uuid = CommonUtils.generateUUIDv5(ClassNames.ConnectivityNode, this.configUuid, key);*/
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CN']), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode((0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
@@ -1095,7 +1092,7 @@ class ConverterIntegral7 {
                     const key = integral_sql_1.I7Objects.KNOTEN_KF + ((_a = bay === null || bay === void 0 ? void 0 : bay.getUUID()) !== null && _a !== void 0 ? _a : '') + String(i7Data.id) + String(i7Data.kpfeld);
                     const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ConnectivityNode, this.configUuid, key);
                     // const connectivityNode = new ConnectivityNode(getUUID(i7Data.guid, this.objectMappingConfig.standardiseUuid), createNotation([getName(i7Data), '_CN']), 'knotenkf');
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CN']), 'knotenkf');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuid, i7Data.bezeichner, 'knotenkf');
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
@@ -1121,7 +1118,7 @@ class ConverterIntegral7 {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.lkupplung));
                     const key = integral_sql_1.I7Objects.KNOTEN_LK + ((_a = bay === null || bay === void 0 ? void 0 : bay.getUUID()) !== null && _a !== void 0 ? _a : '') + String(i7Data.id) + String(i7Data.lkupplung);
                     const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.ConnectivityNode, this.configUuid, key);
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CN']), 'KnotenLk');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(uuid, i7Data.bezeichner, 'KnotenLk');
                     // const connectivityNode = new ConnectivityNode(CommonUtils.generateUUID(), createNotation([getName(i7Data), '_CN']), 'KnotenLk');
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -1147,7 +1144,7 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const key = integral_sql_1.I7Objects.SCHLAUFE + String(i7Data.id);
                     const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Terminal, this.configUuid, key);
-                    const terminal = new Terminal_1.Terminal(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_Schlaufe_T']), i7Data.kurzname, i7Data.kommentar);
+                    const terminal = new Terminal_1.Terminal(uuid, i7Data.bezeichner, i7Data.kurzname, i7Data.kommentar);
                     terminal.connected = (0, parser_utils_1.convertToBooleanI7)(i7Data.schaltzustand);
                     terminal.phases = PhaseCode_1.PhaseCode.ABC;
                     this.addIdMapping(i7Data.id, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
@@ -1176,7 +1173,7 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.BELASTUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BELASTUNG), knotenSfIDs));
                 for (const i7Data of result) {
-                    const load = targetClass === cim_class_names_1.ClassNames.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CL']), i7Data.kurzname) : new EnergyConsumer_1.EnergyConsumer((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EC']), i7Data.kurzname);
+                    const load = targetClass === cim_class_names_1.ClassNames.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname) : new EnergyConsumer_1.EnergyConsumer((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname);
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                     const spannungslos = (0, parser_utils_1.isBooleanI7)(i7Data.spannungslos) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.spannungslos) : undefined;
                     this.setTopologyEnergySourceConsumerObject(cimModel, load, i7Data);
@@ -1851,7 +1848,7 @@ class ConverterIntegral7 {
             for (const i7Data of result) {
                 const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7Data.bezeichner, i7Data.kurzname);
                 // ??
-                const usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : undefined;
+                // const usoll = isNumericI7(i7Data.usoll) ? convertToNumberI7(i7Data.usoll) : undefined;
                 // TODO: Beteiligen sich Ersatzquerzweige an der Wirkleistungsregelung? Hier: NEIN
                 const governorscd = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
                 externalNetworkInjection.governorSCD = governorscd;
@@ -2114,7 +2111,8 @@ class ConverterIntegral7 {
                         integral_prefix_1.MITTIGER_PUNKT +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
                     const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const equivalentBranch = new INTEGRALEquivalentBranch_1.INTEGRALEquivalentBranch(rdfid, (0, util_create_1.createNotation)([i7Data.bezeichner, '_', rdfid.substring(0, 8), '_EB'], 32, true), i7Data.kurzname, i7Schluessel);
+                    const equivalentBranch = new INTEGRALEquivalentBranch_1.INTEGRALEquivalentBranch(rdfid, i7Data.bezeichner, i7Data.kurzname, i7Schluessel);
+                    equivalentBranch.key = i7Schluessel;
                     const flag_lfl = (0, parser_utils_1.isBooleanI7)(i7Data.flag_lfl) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lfl) : false;
                     const flag_ks = (0, parser_utils_1.isBooleanI7)(i7Data.flag_ks) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_ks) : false;
                     // Topologie
@@ -3227,7 +3225,7 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.QUERKUPPLUNG), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_B']), 'Querkupplung');
+                    const bay = new AMPRIONBay_1.AMPRIONBay(uuid, i7Data.bezeichner, 'Querkupplung');
                     bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
@@ -3237,7 +3235,7 @@ class ConverterIntegral7 {
                         const i7Schluessel = voltageLevel.description +
                             integral_prefix_1.QUERKUPPLUNG_PRAEFIX +
                             (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                        bay.description = i7Schluessel;
+                        bay.key = i7Schluessel;
                     }
                     else {
                         this.logger.debug(`debug --- Querkupplung ${i7Data.id} besitzt keine Anlage.`);
@@ -4475,7 +4473,7 @@ class ConverterIntegral7 {
                 }
                 for (const i7Data of result) {
                     const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(uuid, i7Data.bezeichner, i7Data.kurzname, i7Data.langname);
                     const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer, this.configUuid);
                     /** AssetInfos */
                     if (i7Data.baujahr) {
@@ -5327,9 +5325,10 @@ class ConverterIntegral7 {
         }
     }
     createIfNotExistOperationalLimitType(cimModel, name, type, direction) {
+        var _a;
         let operationalLimitType = cimModel.getOperationalLimitTypeByName(name);
         if (!operationalLimitType) {
-            const key = type + direction + cimModel.geographicalRegions.values().next().value.mrid;
+            const key = ((_a = cimModel.getModelingAuthoritySet()) !== null && _a !== void 0 ? _a : '') + type + direction;
             const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.OperationalLimitType, this.configUuid, key);
             operationalLimitType = new OperationalLimitType_1.OperationalLimitType(uuid, name);
             operationalLimitType.direction = direction;
@@ -5691,7 +5690,7 @@ class ConverterIntegral7 {
             for (const frame of boundaryFrames) {
                 this.addDefaultObjectsLoadModel(frame.cimModel, defaultValuesConfig);
                 this.addDefaultObjectsGeo(frame.cimModel, defaultValuesConfig);
-                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_EQ_BD, rdf_xml_1.RDF_XML.PROFILE_DL], tempDirPath);
+                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_EQ_BD, rdf_xml_1.RDF_XML.PROFILE_DL], tempDirPath, this.configUuid);
                 // GL als DependentModel
                 frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_GL, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
                 frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_DL, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
@@ -5701,12 +5700,12 @@ class ConverterIntegral7 {
             for (const frame of gridFrames) {
                 this.addDefaultObjectsLoadModel(frame.cimModel, defaultValuesConfig);
                 this.addDefaultObjectsGeo(frame.cimModel, defaultValuesConfig);
-                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_DL, rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_AMPI7, rdf_xml_1.RDF_XML.PROFILE_DY, rdf_xml_1.RDF_XML.PROFILE_SV], tempDirPath);
+                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_DL, rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_AMPI7, rdf_xml_1.RDF_XML.PROFILE_DY, rdf_xml_1.RDF_XML.PROFILE_SV], tempDirPath, this.configUuid);
             }
             this.exportFrames = this.associateGeoRegionsToExportFrames(gridFrames);
             // Default Model
             this.exportFrameDefault.cimModel = this.cimModelDefault;
-            this.exportFrameDefault.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_AMPI7], tempDirPath);
+            this.exportFrameDefault.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_AMPI7], tempDirPath, this.configUuid);
         });
     }
     initExportFrames(exportConfig, geoRegions, subGeoRegions) {