@enervance/insight-cim-model 0.0.105 → 0.0.106

package/dist/converter/integral7/converter.integral7.d.ts

@@ -14,6 +14,7 @@ import { INTEGRALModelContainer } from '../../model-container/model/INTEGRALMode
 import { DLConverterI7 } from './dl-convert/dl-converter-i7.js';
 import { ModelContainer } from '../../model-container/model/ModelContainer.js';
 import { DCGround } from '../../model/dc/DCGround.js';
+import { IEnergySourceTypeMapping } from './interface-i7/energy-source.type.mapping.js';
 export declare class ConverterIntegral7 {
     logger: ILogger;
     /** Verbindung zur MySQL DB */
@@ -58,8 +59,8 @@ export declare class ConverterIntegral7 {
      * @param energyTypesConfig Mapping von I7-Multiplikationsfaktoren auf CIM Klassen
      * @param tempDirPath temporäres Verzeichnis zum Speichern der Zwischenergebnisse
      * @return ein Promise mit Statusangabe */
-    convert(objectMappingConfig: IObjectMappingConfig, defaultValuesConfig: IDefaultValuesConfig, energyTypesConfig: any, exportConfig: IExportConfig[], tempDirPath: string): Promise<ConverterStatus>;
-    convertFrame(frame: I7ExportFrame, geoRegion: GeographicalRegion, objectMappingConfig: IObjectMappingConfig, energyTypesConfig: any, defaultValuesConfig: IDefaultValuesConfig): Promise<void>;
+    convert(objectMappingConfig: IObjectMappingConfig, defaultValuesConfig: IDefaultValuesConfig, energyTypesConfig: any, exportConfig: IExportConfig[], energySourceTypeMappingConfig: IEnergySourceTypeMapping[], tempDirPath: string): Promise<ConverterStatus>;
+    convertFrame(frame: I7ExportFrame, geoRegion: GeographicalRegion, objectMappingConfig: IObjectMappingConfig, energyTypesConfig: any, defaultValuesConfig: IDefaultValuesConfig, energySourceTypeMappingConfig: IEnergySourceTypeMapping[]): Promise<void>;
     private assignTerminalSequenceNumber;
     convertGeoRegionen(): Promise<GeographicalRegion[]>;
     convertRegelzone(cimModel: ModelContainer, defaultValuesConfig: IDefaultValuesConfig): Promise<void>;
@@ -76,7 +77,7 @@ export declare class ConverterIntegral7 {
     convertKnotenLk(cimModel: ModelContainer, laengskupplungIDs: number[]): Promise<void>;
     convertSchlaufen(cimModel: ModelContainer, integral7: Integral7Model, knotenSoIDs: number[]): Promise<void>;
     convertBelastungen(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], defaultValuesConfig: IDefaultValuesConfig, targetClass: string): Promise<any>;
-    convertEinspeisungen(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], objectMappingConfig: IObjectMappingConfig): Promise<void>;
+    convertEinspeisungen(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], objectMappingConfig: IObjectMappingConfig, energySourceTypeMappingConfig: IEnergySourceTypeMapping[]): Promise<void>;
     convertErsatzQuerZweige(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], targetClass: string): Promise<void>;
     convertGeneratoren(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], energyTypesConfig: any): Promise<void>;
     convertAsynchronmotor(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], defaultValuesConfig: IDefaultValuesConfig): Promise<void>;
@@ -96,7 +97,7 @@ export declare class ConverterIntegral7 {
     convertSVC(cimModel: ModelContainer, knotenSfIDs: number[]): Promise<void>;
     convertCsConverterDC(cimModel: ModelContainer, integral7: Integral7Model, knotenSfIDs: number[]): Promise<void>;
     convertVsConverterDC(cimModel: ModelContainer, integral7: Integral7Model, knotenSfIDs: number[]): Promise<void>;
-    convertEinspeisungen2EnergySource(cimModel: ModelContainer, result: Einspeisung[]): Promise<void>;
+    convertEinspeisungen2EnergySource(cimModel: ModelContainer, result: Einspeisung[], energySourceTypeMappingConfig: IEnergySourceTypeMapping[]): Promise<void>;
     private convertEnergySourceToExternalNetworkInjection;
     private convertEinspeisungen2EquivalentInjection;
     private convertEinspeisungen2ExternalNetworkInjection;

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

@@ -171,7 +171,7 @@ class ConverterIntegral7 {
      * @param energyTypesConfig Mapping von I7-Multiplikationsfaktoren auf CIM Klassen
      * @param tempDirPath temporäres Verzeichnis zum Speichern der Zwischenergebnisse
      * @return ein Promise mit Statusangabe */
-    convert(objectMappingConfig, defaultValuesConfig, energyTypesConfig, exportConfig, tempDirPath) {
+    convert(objectMappingConfig, defaultValuesConfig, energyTypesConfig, exportConfig, energySourceTypeMappingConfig, tempDirPath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.createColumnIndex();
@@ -199,7 +199,7 @@ class ConverterIntegral7 {
                     const geoRegion = frame.cimModel.getGeographicalRegion(geoRegionUUID);
                     if (!geoRegion)
                         continue;
-                    yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
+                    yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig);
                 }
                 console.log('Convert MAS Profiles');
                 for (const entry of this.exportFrames.entries()) {
@@ -210,7 +210,7 @@ class ConverterIntegral7 {
                         continue;
                     // frame.addDependentModel(RDF_XML.PROFILE_EQ_BD, this.exportFramesBoundary.entries().next()?.value[1].getModelUUID(RDF_XML.PROFILE_EQ_BD));
                     console.log(`Convert MAS profile: ${frame.mas}`);
-                    yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig);
+                    yield this.convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig);
                     if (boundaryEqUUId) {
                         frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ, boundaryEqUUId);
                     }
@@ -266,7 +266,7 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig) {
+    convertFrame(frame, geoRegion, objectMappingConfig, energyTypesConfig, defaultValuesConfig, energySourceTypeMappingConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const integral7Modell = frame.getI7Model();
             const cimModel = frame.cimModel;
@@ -413,7 +413,7 @@ class ConverterIntegral7 {
             /** Einspeisungen -> EnergySources */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks.performance.now();
-                yield this.convertEinspeisungen(cimModel, soSfKnoten, objectMappingConfig);
+                yield this.convertEinspeisungen(cimModel, soSfKnoten, objectMappingConfig, energySourceTypeMappingConfig);
                 logExecutionTime(this.logger, startTime, `convertEinspeisungen`);
             }
             /** Generatoren -> SynchronousMachine */
@@ -1090,7 +1090,7 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertEinspeisungen(cimModel, knotenSfIDs, objectMappingConfig) {
+    convertEinspeisungen(cimModel, knotenSfIDs, objectMappingConfig, energySourceTypeMappingConfig) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const targetConfig = objectMappingConfig.Einspeisung;
@@ -1111,11 +1111,11 @@ class ConverterIntegral7 {
                             // Westnetz Hochspannungsheuristik
                             const i7SlacksResults = result.filter(it => it.spannungsgeregelt);
                             const i7EnergySourceResults = result.filter(it => !it.spannungsgeregelt);
-                            yield this.convertEinspeisungen2EnergySource(cimModel, i7EnergySourceResults);
+                            yield this.convertEinspeisungen2EnergySource(cimModel, i7EnergySourceResults, energySourceTypeMappingConfig);
                             yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, i7SlacksResults);
                         }
                         else {
-                            yield this.convertEinspeisungen2EnergySource(cimModel, result);
+                            yield this.convertEinspeisungen2EnergySource(cimModel, result, energySourceTypeMappingConfig);
                         }
                     }
                 }
@@ -2633,28 +2633,47 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertEinspeisungen2EnergySource(cimModel, result) {
-        var _a, _b, _c;
+    convertEinspeisungen2EnergySource(cimModel, result, energySourceTypeMappingConfig) {
+        var _a, _b, _c, _d;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
+                    if (i7Data.guid === '_c962ec9f-6d05-4f80-a0fc-6f11e430baaa') {
+                        console.log();
+                    }
                     const prio = i7Data.einspprio;
                     const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : false;
-                    if (prio > 0) {
-                        this.convertEnergySourceToExternalNetworkInjection(cimModel, i7Data, prio, inBetrieb);
-                    }
-                    else {
-                        const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                        const energySource = new EnergySource_1.EnergySource(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), rdfid.substring(0, 8), '_ES'], 32, true), i7Data.kurzname);
-                        energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
-                        const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
-                        energySource.activePower = powerData[0];
-                        energySource.reactivePower = powerData[1];
-                        this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
-                        // ToDo PSRType
-                        cimModel.addEnergySource(energySource);
-                        this.addIdMapping(i7Data.id, energySource.mrid, integral_sql_1.Integral7TableNames.EINSPEISUNG);
-                    }
+                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
+                    const energySource = new EnergySource_1.EnergySource(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), rdfid.substring(0, 8), '_ES'], 32, true), i7Data.kurzname);
+                    energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
+                    energySource.normallyInService = inBetrieb;
+                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
+                    energySource.activePower = powerData[0];
+                    energySource.reactivePower = powerData[1];
+                    this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
+                    // PSRType
+                    /** 1 Primärergie-Angabe */
+                    let typeName = (_d = energySourceTypeMappingConfig.find(it => it.i7Name === i7Data.nameprimaertyp)) === null || _d === void 0 ? void 0 : _d.ePlanningType;
+                    /** 2 Anhand des Namens vom Objekt */
+                    if (!typeName) {
+                        typeName = (0, utils_1.getTypeNameFromStringByRegEx)(i7Data.bezeichner, energySourceTypeMappingConfig);
+                    }
+                    /** 3 Anhand des Names vom Multiplikationsfaktor */
+                    if (!typeName) {
+                        const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
+                        if (mf)
+                            typeName = (0, utils_1.getTypeNameFromStringByRegEx)(mf.name, energySourceTypeMappingConfig);
+                    }
+                    if (typeName) {
+                        const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, typeName);
+                        energySource.psrTypeUUID = psrType.mrid;
+                    }
+                    if (typeName === 'Wasserkraft') {
+                        energySource.activePower = 0;
+                        energySource.reactivePower = 0;
+                    }
+                    cimModel.addEnergySource(energySource);
+                    this.addIdMapping(i7Data.id, energySource.mrid, integral_sql_1.Integral7TableNames.EINSPEISUNG);
                 }
                 catch (err) {
                     this.logger.error(`Err convertEinspeisungen2EnergySource ${i7Data.id} ${err}`);