@enervance/insight-cim-model 0.0.208-dev → 0.0.209

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 (40) hide show
  1. package/dist/converter/integral7/converter.integral7.js +17 -32
  2. package/dist/converter/integral7/converter.integral7.js.map +1 -1
  3. package/dist/converter/integral7/dl-convert/data-manager.d.ts +4 -1
  4. package/dist/converter/integral7/dl-convert/data-manager.js +7 -3
  5. package/dist/converter/integral7/dl-convert/data-manager.js.map +1 -1
  6. package/dist/converter/integral7/dl-convert/dl-converter-i7.d.ts +4 -6
  7. package/dist/converter/integral7/dl-convert/dl-converter-i7.js +57 -69
  8. package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
  9. package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.d.ts +10 -0
  10. package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js +43 -1
  11. package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js.map +1 -1
  12. package/dist/converter/integral7/dl-convert/executor.d.ts +1 -0
  13. package/dist/converter/integral7/dl-convert/executor.js +5 -3
  14. package/dist/converter/integral7/dl-convert/executor.js.map +1 -1
  15. package/dist/converter/integral7/utils.d.ts +0 -5
  16. package/dist/converter/integral7/utils.js +1 -20
  17. package/dist/converter/integral7/utils.js.map +1 -1
  18. package/dist/etl/etl-neplan/et-neplan-regex.d.ts +4 -0
  19. package/dist/etl/etl-neplan/et-neplan-regex.js +5 -1
  20. package/dist/etl/etl-neplan/et-neplan-regex.js.map +1 -1
  21. package/dist/etl/etl-neplan/etl-neplan-csv.d.ts +2 -2
  22. package/dist/etl/etl-neplan/etl-neplan-csv.js +15 -10
  23. package/dist/etl/etl-neplan/etl-neplan-csv.js.map +1 -1
  24. package/dist/model/dc/DCTerminal.js +1 -1
  25. package/dist/model/dc/DCTerminal.js.map +1 -1
  26. package/dist/model/extensions/enervance/assetinfo/EVWireInfo.d.ts +3 -0
  27. package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js +17 -0
  28. package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js.map +1 -1
  29. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.d.ts +3 -0
  30. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js +16 -0
  31. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js.map +1 -1
  32. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.d.ts +3 -0
  33. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js +20 -0
  34. package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js.map +1 -1
  35. package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.d.ts +4 -4
  36. package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.js +4 -4
  37. package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.js.map +1 -1
  38. package/dist/utils2/common.utils.js +0 -3
  39. package/dist/utils2/common.utils.js.map +1 -1
  40. package/package.json +1 -2
@@ -538,7 +538,9 @@ class ConverterIntegral7 {
538
538
  yield this.assignTerminalSequenceNumber(cimModel);
539
539
  logExecutionTime(this.logger, startTime, `assignment of sequence number`);
540
540
  /** DC Model */
541
- /** DL Profile */
541
+ /**
542
+ * DL Profile
543
+ **/
542
544
  if (!frame.boundary) {
543
545
  this.executor = new executor_1.Executor(this.mysqlController, this.configUuid);
544
546
  yield this.executor.mergeDataFromIntegralID2UUID(this.integralID2UUID);
@@ -567,7 +569,6 @@ class ConverterIntegral7 {
567
569
  const netzStreckenlastIds = [...integral7Modell.integralLeitungen.values()].map(leitung => leitung.streckenlastId).filter(id => id !== undefined && id !== null);
568
570
  const allLeitungIds = [...new Set([...netzLeitungIds, ...netzHgueLeitungIds, ...netzErsatzlaengszweigIds, ...netzStreckenlastIds]).values()];
569
571
  const convertOptions = {
570
- visible_only: true,
571
572
  only: {
572
573
  netz_standortIds,
573
574
  netz_knotensoIds,
@@ -618,6 +619,7 @@ class ConverterIntegral7 {
618
619
  }
619
620
  }
620
621
  this.executor.dataManager.cimModelGraph.purgeAll();
622
+ this.executor.dataManager.dbObjectKeyCimModelUuidGraph.purgeAll();
621
623
  }
622
624
  });
623
625
  }
@@ -1001,7 +1003,7 @@ class ConverterIntegral7 {
1001
1003
  });
1002
1004
  }
1003
1005
  convertSammelschienenAbschnitte(cimModel, integral7, schaltanlagenAbschnittIDs) {
1004
- var _a, _b;
1006
+ var _a;
1005
1007
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
1006
1008
  if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SAMMELSCHIENE)) {
1007
1009
  const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SAMMELSCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SAMMELSCHIENE), schaltanlagenAbschnittIDs));
@@ -1012,11 +1014,7 @@ class ConverterIntegral7 {
1012
1014
  const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, i7Data.bezeichner, i7Data.kurzname);
1013
1015
  const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
1014
1016
  connectivityNode.nodeNumber = i7Data.id_psse_cape;
1015
- const keyBusbarSection = [
1016
- integral_sql_1.I7Objects.SAMMELSCHIENE,
1017
- (_a = voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.getUUID()) !== null && _a !== void 0 ? _a : '',
1018
- (_b = connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getUUID()) !== null && _b !== void 0 ? _b : ''
1019
- ].join('');
1017
+ const keyBusbarSection = (_a = integral_sql_1.I7Objects.SAMMELSCHIENE + (voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.getUUID())) !== null && _a !== void 0 ? _a : '' + (connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getUUID());
1020
1018
  const uuidBusbarSection = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.BusbarSection, this.configUuid, keyBusbarSection);
1021
1019
  const busbarSection = new BusbarSection_1.BusbarSection(uuidBusbarSection, i7Data.bezeichner, i7Schaltanlagenabschnitt.kurzname);
1022
1020
  busbarSection.ipMax = i7Data.limit_ip;
@@ -1421,12 +1419,10 @@ class ConverterIntegral7 {
1421
1419
  synchronousMachine.ratedPowerFactor = cosphir ? cosphir : undefined;
1422
1420
  /** EQ-SC */
1423
1421
  synchronousMachine.earthing = ((_a = i7Data.erdung) === null || _a === void 0 ? void 0 : _a.length) > 0 && i7Data.erdung != 'isoliert' ? true : false;
1424
- synchronousMachine.r = (0, parser_utils_1.isNumericI7)(i7Data.rg) ? (0, utils_2.calculatePU2OHM)((0, parser_utils_1.convertToNumberI7)(i7Data.rg), synchronousMachine.ratedU, synchronousMachine.ratedS) :
1425
- ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.rg) ? (0, utils_2.calculatePU2OHM)((0, parser_utils_1.convertToNumberI7)(i7Data.rg), synchronousMachine.ratedU, synchronousMachine.ratedS) : undefined);
1422
+ synchronousMachine.r = (0, parser_utils_1.isNumericI7)(i7Data.rg) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rg) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.rg) ? (0, parser_utils_1.convertToNumberI7)(genType.rg) : undefined);
1426
1423
  synchronousMachine.r0 = 0;
1427
1424
  synchronousMachine.r2 = 0;
1428
- synchronousMachine.x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0g) ? (0, utils_2.calculatePU2OHM)((0, parser_utils_1.convertToNumberI7)(i7Data.x0g), synchronousMachine.ratedU, synchronousMachine.ratedS) :
1429
- ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.x0g) ? (0, utils_2.calculatePU2OHM)((0, parser_utils_1.convertToNumberI7)(i7Data.x0g), synchronousMachine.ratedU, synchronousMachine.ratedS) : undefined);
1425
+ synchronousMachine.x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0g) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0g) : undefined;
1430
1426
  synchronousMachine.x2 = 0;
1431
1427
  synchronousMachine.satDirectSubtransX = (0, parser_utils_1.isNumericI7)(i7Data.xd2s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xd2s) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.xd2s) ? (0, parser_utils_1.convertToNumberI7)(genType.xd2s) : undefined);
1432
1428
  // synchronousMachine.earthingStarPointR
@@ -1885,9 +1881,6 @@ class ConverterIntegral7 {
1885
1881
  convertErsatzQuerZweige2EquivalentInjection(cimModel, targetVoltages, result) {
1886
1882
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
1887
1883
  for (const i7Data of result) {
1888
- if (i7Data.guid === '_8addc711-52fd-4ff6-b5ff-50aadc1a32ec') {
1889
- const stop = true;
1890
- }
1891
1884
  const einspeisePrio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : 1;
1892
1885
  const flag_lfl = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lfl);
1893
1886
  const flag_ks = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_ks);
@@ -1936,12 +1929,12 @@ class ConverterIntegral7 {
1936
1929
  }
1937
1930
  else if (flag_lfl || flag_ks) {
1938
1931
  equivalentInjection.regulationCapability = false;
1939
- equivalentInjection.r = (0, parser_utils_1.isNumericI7)(r1) ? 1e9 : r1;
1940
- equivalentInjection.r0 = (0, parser_utils_1.isNumericI7)(r0) ? 1e9 : r0;
1941
- equivalentInjection.r2 = (0, parser_utils_1.isNumericI7)(r1) ? 1e9 : r1;
1942
- equivalentInjection.x = (0, parser_utils_1.isNumericI7)(x1) ? 1e9 : x1;
1943
- equivalentInjection.x0 = (0, parser_utils_1.isNumericI7)(x0) ? 1e9 : x0;
1944
- equivalentInjection.x2 = (0, parser_utils_1.isNumericI7)(x1) ? 1e9 : x1;
1932
+ equivalentInjection.r = r1;
1933
+ equivalentInjection.r0 = r0;
1934
+ equivalentInjection.r2 = r1;
1935
+ equivalentInjection.x = x1;
1936
+ equivalentInjection.x0 = x0;
1937
+ equivalentInjection.x2 = x1;
1945
1938
  }
1946
1939
  /** Export Extended Ward equivalent with no voltage regulation */
1947
1940
  else if (((r_ext !== undefined && r_ext !== 0) || (x_ext !== undefined && x_ext !== 0))) {
@@ -2760,9 +2753,6 @@ class ConverterIntegral7 {
2760
2753
  externalNetworkInjection.multiplierFactorUUID = mf.getUUID();
2761
2754
  }
2762
2755
  /** Convert EQ-profile dataset. */
2763
- if (i7Data.guid === '_ab64e281-72d0-45fb-8cb3-da4ae99a4f8c') {
2764
- const stop = true;
2765
- }
2766
2756
  let einspeisePrioritaet = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
2767
2757
  const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
2768
2758
  externalNetworkInjection.maxP = maxP;
@@ -4205,7 +4195,6 @@ class ConverterIntegral7 {
4205
4195
  if (startDCNodeNeg) {
4206
4196
  const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminaln1')), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
4207
4197
  dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
4208
- dcTerminal.connected = true;
4209
4198
  dcTerminal.dcNode = startDCNodeNeg;
4210
4199
  dcLineSegmentNeg.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
4211
4200
  startDCNodeNeg.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
@@ -4219,7 +4208,6 @@ class ConverterIntegral7 {
4219
4208
  if (targetDCNode) {
4220
4209
  const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminalp2')), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT'], 32, true));
4221
4210
  dcTerminal.dCConductingEquipment = dcLineSegment;
4222
- dcTerminal.connected = true;
4223
4211
  dcTerminal.dcNode = targetDCNode;
4224
4212
  dcLineSegment.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
4225
4213
  targetDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
@@ -4231,7 +4219,6 @@ class ConverterIntegral7 {
4231
4219
  if (targetDCNodeNeg) {
4232
4220
  const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminaln2')), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
4233
4221
  dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
4234
- dcTerminal.connected = true;
4235
4222
  dcTerminal.dcNode = targetDCNodeNeg;
4236
4223
  dcLineSegmentNeg.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
4237
4224
  targetDCNodeNeg.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
@@ -4245,7 +4232,6 @@ class ConverterIntegral7 {
4245
4232
  const dcTerminalM3UUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCTerminal, this.configUuid, dcTerminalKey);
4246
4233
  const dcTerminal = new DCTerminal_1.DCTerminal(dcTerminalM3UUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCT'], 32, true));
4247
4234
  dcTerminal.dCConductingEquipment = dcLineSegmentNeutral;
4248
- dcTerminal.connected = true;
4249
4235
  dcTerminal.dcNode = dcNodeStartMiddle;
4250
4236
  dcLineSegmentNeutral.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
4251
4237
  dcNodeStartMiddle.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
@@ -4259,7 +4245,6 @@ class ConverterIntegral7 {
4259
4245
  const dcTerminalM3UUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Terminal, this.configUuid, dcTerminalKey);
4260
4246
  const dcTerminal = new DCTerminal_1.DCTerminal(dcTerminalM3UUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCT'], 32, true));
4261
4247
  dcTerminal.dCConductingEquipment = dcLineSegmentNeutral;
4262
- dcTerminal.connected = true;
4263
4248
  dcTerminal.dcNode = dcNodeTargetMiddle;
4264
4249
  dcLineSegmentNeutral.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
4265
4250
  dcNodeTargetMiddle.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
@@ -6173,7 +6158,7 @@ class ConverterIntegral7 {
6173
6158
  * */
6174
6159
  /** Regelung */
6175
6160
  const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`), this.objectMappingConfig.standardiseUuid), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
6176
- ratioTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`)) ? !(0, parser_utils_1.convertToBooleanI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`)) : true;
6161
+ ratioTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) ? !(0, parser_utils_1.convertToBooleanI7)(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) : false;
6177
6162
  ratioTapChanger.transformerEnd = transformerEnd;
6178
6163
  //transformerEnd.ratioTapChanger = ratioTapChanger;
6179
6164
  ratioTapChanger.neutralU = transformerEnd.ratedU;
@@ -6273,9 +6258,9 @@ class ConverterIntegral7 {
6273
6258
  }
6274
6259
  }
6275
6260
  // Attribute
6276
- phaseTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`)) ? !(0, parser_utils_1.convertToBooleanI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`)) : true;
6261
+ phaseTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`)) ? (0, parser_utils_1.convertToBooleanI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`)) : false;
6277
6262
  phaseTapChanger.transformerEnd = transformerEnd;
6278
- phaseTapChanger.neutralU = transformerEnd.ratedU;
6263
+ //transformerEnd.phaseTapChanger = phaseTapChanger;
6279
6264
  // Wirkleistungsregelung Anschluss
6280
6265
  const pRegulationToNode = (0, parser_utils_1.isNumericI7)(i7Data.nach_a_nr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.nach_a_nr) : undefined;
6281
6266
  const regulatingTransformerEnd = transformerEnds.find(elem => elem.endNumber === pRegulationToNode);