@enervance/insight-cim-model 0.0.258 → 0.0.260

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

@@ -10,11 +10,10 @@ import { DefaultValuesConfigInterface } from './interface-i7/default-values-conf
 import { I7ExportFrame } from './interface-i7/export-frame-i7.js';
 import { ObjectMappingConfigInterface } from './interface-i7/object-mapping-config.interface.js';
 import { AsynchronmotorTyp, Einspeisung, Ersatzquerzweig, GeneratorTyp, KDrosselTyp, Standort, Trafo } from './model/interfaces.js';
-import { ConfigurableDLConvertOptions, Executor } from './dl-convert/executor.js';
+import { Executor } from './dl-convert/executor.js';
 import { IEnergySourceTypeMapping } from './interface-i7/energy-source.type.mapping.js';
 import { IUuidConfig } from './interface-i7/uuid-config.interface.js';
 export declare class ConverterIntegral7 {
-    #private;
     logger: ILogger;
     terminalUUID: string;
     /** Verbindung zur MySQL DB */
@@ -60,8 +59,6 @@ export declare class ConverterIntegral7 {
     executor: Executor;
     objectMappingConfig: ObjectMappingConfigInterface;
     defaultValuesConfig: DefaultValuesConfigInterface;
-    set configurableDLConvertOptions(arg: ConfigurableDLConvertOptions);
-    get configurableDLConvertOptions(): ConfigurableDLConvertOptions;
     constructor();
     /**
      * Konvertiert das Netz aus der MySQL Datenbank

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

@@ -1,5 +1,4 @@
 "use strict";
-var _ConverterIntegral7_configurableDLConvertOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGeoCoordinates = exports.ConverterIntegral7 = void 0;
 const tslib_1 = require("tslib");
@@ -147,12 +146,6 @@ const i7_graph_utils_1 = require("./model/i7-graph-utils.js");
 const TopologicalNode_1 = require("../../model/topology/TopologicalNode.js");
 const geodata_util_1 = require("../../util/geodata.util.js");
 class ConverterIntegral7 {
-    set configurableDLConvertOptions(arg) {
-        tslib_1.__classPrivateFieldSet(this, _ConverterIntegral7_configurableDLConvertOptions, arg, "f");
-    }
-    get configurableDLConvertOptions() {
-        return tslib_1.__classPrivateFieldGet(this, _ConverterIntegral7_configurableDLConvertOptions, "f");
-    }
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
         this.exportFrames = new Map();
@@ -187,7 +180,6 @@ class ConverterIntegral7 {
         this.ersatzZweigAnschlussKnotenIDs = new Set();
         /** List of Blocktransformatoren */
         this.blocktransformatoren = [];
-        _ConverterIntegral7_configurableDLConvertOptions.set(this, {});
     }
     /**
      * Konvertiert das Netz aus der MySQL Datenbank
@@ -298,7 +290,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;
@@ -570,7 +561,6 @@ class ConverterIntegral7 {
                 const netz_standortIds = standortIDs.map(standortId => {
                     return { id: standortId };
                 });
-                const boundary_standortIds = [];
                 const netz_knotensoIds = knotenSoIDs.map(knotenSoId => {
                     return { id: knotenSoId };
                 });
@@ -580,7 +570,6 @@ class ConverterIntegral7 {
                     });
                     entry[1].integral7Modell.integralKnotenSo.forEach((_, key) => {
                         netz_knotensoIds.push({ id: key });
-                        boundary_standortIds.push({ id: key });
                     });
                 }
                 const netzLeitungIds = [...integral7Modell.integralLeitungen.keys()];
@@ -588,9 +577,9 @@ class ConverterIntegral7 {
                 const netzErsatzlaengszweigIds = [...integral7Modell.integalErsatzLaengszweigIds.values()];
                 const netzStreckenlastIds = [...integral7Modell.integralLeitungen.values()].map(leitung => leitung.streckenlastId).filter(id => id !== undefined && id !== null);
                 const allLeitungIds = [...new Set([...netzLeitungIds, ...netzHgueLeitungIds, ...netzErsatzlaengszweigIds, ...netzStreckenlastIds]).values()];
-                const overall_substation_amount = ((_a = standortIDs === null || standortIDs === void 0 ? void 0 : standortIDs.length) !== null && _a !== void 0 ? _a : 0);
-                this.configurableDLConvertOptions;
-                const convertOptions = Object.assign(Object.assign({}, JSON.parse(JSON.stringify(this.configurableDLConvertOptions))), { overall_substation_amount: overall_substation_amount, visible_only: true, boundary_standortIds, only: {
+                const convertOptions = {
+                    visible_only: true,
+                    only: {
                         netz_standortIds,
                         netz_knotensoIds,
                         netz_schaltanlagenIds: schaltanlagenIDs.map(schaltanlagenId => {
@@ -605,8 +594,8 @@ class ConverterIntegral7 {
                         netz_leitungIds: allLeitungIds.map(leitungId => {
                             return { id: leitungId };
                         })
-                    } });
-                frame.cimModel.addDiagramStyle(this.executor.dlConverter.diagramStyles[cim_constants_1.DiagramLayoutTypes.NODE_BREAKER]);
+                    }
+                };
                 const resultingObjects = yield this.executor.convert(convertOptions);
                 for (const resultingObject of resultingObjects) {
                     if (resultingObject instanceof Diagram_1.Diagram) {
@@ -2064,10 +2053,13 @@ class ConverterIntegral7 {
                 equivalentInjection.q_bel = q_sKonst;
                 equivalentInjection.p_ki = p_ki;
                 equivalentInjection.q_ki = q_ki;
-                const p = (p_ein ? p_ein : 0) + (p_sKonst ? p_sKonst : 0);
-                const q = (q_ein ? q_ein : 0) + (q_sKonst ? q_sKonst : 0);
+                const p = (p_ein ? p_ein : 0) + (p_sKonst ? p_sKonst : 0) + (p_ki ? p_ki : 0);
+                const q = (q_ein ? q_ein : 0) + (q_sKonst ? q_sKonst : 0) + (q_ki ? q_ki : 0);
+                if (i7Data.guid === '_dc09c365-ca51-4e10-964c-fc99b33e98dd') {
+                    console.log();
+                }
                 equivalentInjection.p = p;
-                equivalentInjection.p = q;
+                equivalentInjection.q = q;
                 equivalentInjection.einspeisePrio = einspeisePrio;
                 equivalentInjection.kr = kr;
                 equivalentInjection.aggregate = true; // default Wert im I7 Export. Not needed for EquivalentInjection, BusbarSection, PowerTransformerEnd, EquivalentShunt, EquivalentBranch
@@ -2223,6 +2215,9 @@ class ConverterIntegral7 {
                     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;
+                    if (equivalentBranch.getUUID() === '4d3708ad-7474-4bae-adc4-f636b64cdfc' || i7Data.guid === '_4d3708ad-7474-4bae-adc4-f636b64cdfcb') {
+                        let stop = true;
+                    }
                     // Topologie
                     /** Anfang
                      * 3 moegliche Anschluesse
@@ -2231,9 +2226,6 @@ class ConverterIntegral7 {
                      *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt */
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
-                    if (equivalentBranch.getUUID() === '67528dfe-be93-4c44-81db-5708ecd9377e') {
-                        let stop = true;
-                    }
                     /**EQ */
                     if (flag_lfl && !flag_ks) {
                         equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 10e9;
@@ -6711,7 +6703,6 @@ class ConverterIntegral7 {
     }
 }
 exports.ConverterIntegral7 = ConverterIntegral7;
-_ConverterIntegral7_configurableDLConvertOptions = new WeakMap();
 function getGeoCoordinates(i7Data) {
     /** Fall 1
      * geokoor_pl_breite_h && geokoor_pl_breite_m geokoor_pl_breite_s sind gepflegt */