@enervance/insight-cim-model 0.0.234 → 0.0.236

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 (35) hide show
  1. package/dist/constants/cim-class-names.d.ts +2 -0
  2. package/dist/constants/cim-class-names.js +2 -0
  3. package/dist/constants/cim-class-names.js.map +1 -1
  4. package/dist/converter/integral7/converter.integral7.js +36 -29
  5. package/dist/converter/integral7/converter.integral7.js.map +1 -1
  6. package/dist/converter/integral7/interface-i7/uuid-config.interface.d.ts +1 -0
  7. package/dist/etl/etl-igp/etl-igp.d.ts +2 -0
  8. package/dist/etl/etl-igp/etl-igp.js +7 -0
  9. package/dist/etl/etl-igp/etl-igp.js.map +1 -0
  10. package/dist/index.d.ts +1 -0
  11. package/dist/index.js +6 -4
  12. package/dist/index.js.map +1 -1
  13. package/dist/model/core/IdentifiedObject.js +3 -1
  14. package/dist/model/core/IdentifiedObject.js.map +1 -1
  15. package/dist/model/core/PowerSystemResource.js +2 -2
  16. package/dist/model/core/Substation.js +2 -1
  17. package/dist/model/core/Substation.js.map +1 -1
  18. package/dist/model/equivalents/EquivalentInjection.js +2 -1
  19. package/dist/model/equivalents/EquivalentInjection.js.map +1 -1
  20. package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.d.ts +9 -0
  21. package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js +99 -7
  22. package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js.map +1 -1
  23. package/dist/model/generation/ThermalGeneratingUnit.d.ts +6 -0
  24. package/dist/model/generation/ThermalGeneratingUnit.js +53 -0
  25. package/dist/model/generation/ThermalGeneratingUnit.js.map +1 -1
  26. package/dist/model-container/model/EVModelsContainer.d.ts +6 -0
  27. package/dist/model-container/model/EVModelsContainer.js +19 -2
  28. package/dist/model-container/model/EVModelsContainer.js.map +1 -1
  29. package/dist/utils2/cim.model.utils.js +7 -1
  30. package/dist/utils2/cim.model.utils.js.map +1 -1
  31. package/dist/utils2/common.utils.js +3 -2
  32. package/dist/utils2/common.utils.js.map +1 -1
  33. package/dist/utils2/import.utils.js +0 -2
  34. package/dist/utils2/import.utils.js.map +1 -1
  35. package/package.json +1 -1
@@ -49,6 +49,7 @@ export declare class ClassNames {
49
49
  static readonly Clamp = "Clamp";
50
50
  static readonly EquivalentBranch = "EquivalentBranch";
51
51
  static readonly EquivalentInjection = "EquivalentInjection";
52
+ static readonly INTEGRALEquivalentInjection = "INTEGRALEquivalentInjection";
52
53
  static readonly LoadArea = "LoadArea";
53
54
  static readonly SubLoadArea = "SubLoadArea";
54
55
  static readonly ConformLoadGroup = "ConformLoadGroup";
@@ -171,6 +172,7 @@ export declare class ClassNames {
171
172
  static readonly AMPRIONProtectionCurrentLimit = "AMPRIONProtectionCurrentLimit";
172
173
  static readonly AMPRIONThermalCurrentLimit = "AMPRIONThermalCurrentLimit";
173
174
  static readonly AMPRIONThermalConnectionCurrentLimit = "AMPRIONThermalConnectionCurrentLimit";
175
+ static readonly INTEGRALMultiplierFactor = "INTEGRALMultiplierFactor";
174
176
  static readonly RdfClass = "RdfClass";
175
177
  static readonly RdfProperty = "RdfProperty";
176
178
  static readonly RdfEnum = "RdfEnum";
@@ -60,6 +60,7 @@ ClassNames.Clamp = "Clamp";
60
60
  //Equivalents
61
61
  ClassNames.EquivalentBranch = "EquivalentBranch"; //Switch -> ProtectedSwitch
62
62
  ClassNames.EquivalentInjection = "EquivalentInjection"; //Switch -> ProtectedSwitch
63
+ ClassNames.INTEGRALEquivalentInjection = "INTEGRALEquivalentInjection"; //Switch -> ProtectedSwitch
63
64
  //LoadModel
64
65
  ClassNames.LoadArea = "LoadArea";
65
66
  ClassNames.SubLoadArea = "SubLoadArea";
@@ -206,6 +207,7 @@ ClassNames.AMPRIONMaxInstrumentalCurrentLimit = "AMPRIONMaxInstrumentalCurrentLi
206
207
  ClassNames.AMPRIONProtectionCurrentLimit = "AMPRIONProtectionCurrentLimit";
207
208
  ClassNames.AMPRIONThermalCurrentLimit = "AMPRIONThermalCurrentLimit";
208
209
  ClassNames.AMPRIONThermalConnectionCurrentLimit = "AMPRIONThermalConnectionCurrentLimit";
210
+ ClassNames.INTEGRALMultiplierFactor = "INTEGRALMultiplierFactor";
209
211
  //MetaModel
210
212
  ClassNames.RdfClass = "RdfClass";
211
213
  ClassNames.RdfProperty = "RdfProperty";
@@ -1 +1 @@
1
- {"version":3,"file":"cim-class-names.js","sourceRoot":"","sources":["../../src/constants/cim-class-names.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cim-class-names.js","sourceRoot":"","sources":["../../src/constants/cim-class-names.ts"],"names":[],"mappings":"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"}
@@ -1256,7 +1256,7 @@ class ConverterIntegral7 {
1256
1256
  /** powerData 0 -> Wirkleistung
1257
1257
  * 1 -> Blindleitung */
1258
1258
  const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
1259
- if (mf && targetClass === cim_class_names_1.ClassNames.ConformLoad) {
1259
+ if (mf) {
1260
1260
  cimModel.addMultiplierFactor(mf);
1261
1261
  load.multiplierFactorUUID = mf.getUUID();
1262
1262
  }
@@ -1266,10 +1266,12 @@ class ConverterIntegral7 {
1266
1266
  load.p = powerData[0];
1267
1267
  load.q = powerData[1];
1268
1268
  /** AMPI7 profile */
1269
- load.p_mf = powerData[2] ? powerData[2] : undefined;
1270
- load.q_mf = powerData[3] ? powerData[3] : undefined;
1271
- load.cos_phi = (0, parser_utils_1.isNumericI7)(i7Data.cos_phi) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi) : undefined;
1272
- load.normallyInService = inBetrieb;
1269
+ if (targetClass === cim_class_names_1.ClassNames.ConformLoad) {
1270
+ load.p_mf = powerData[2] ? powerData[2] : undefined;
1271
+ load.q_mf = powerData[3] ? powerData[3] : undefined;
1272
+ load.cos_phi = (0, parser_utils_1.isNumericI7)(i7Data.cos_phi) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi) : undefined;
1273
+ load.normallyInService = inBetrieb;
1274
+ }
1273
1275
  //TODO
1274
1276
  /* conformLoad.pFixed = conformLoad.p;
1275
1277
  conformLoad.qFixed = conformLoad.q; */
@@ -1959,9 +1961,6 @@ class ConverterIntegral7 {
1959
1961
  convertErsatzQuerZweige2EquivalentInjection(cimModel, targetVoltages, result) {
1960
1962
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
1961
1963
  for (const i7Data of result) {
1962
- if (i7Data.guid === '_8addc711-52fd-4ff6-b5ff-50aadc1a32ec') {
1963
- const stop = true;
1964
- }
1965
1964
  const einspeisePrio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : 1;
1966
1965
  const flag_lfl = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lfl);
1967
1966
  const flag_ks = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_ks);
@@ -1971,19 +1970,24 @@ class ConverterIntegral7 {
1971
1970
  const sk2 = (0, parser_utils_1.isNumericI7)(i7Data.sk) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk) : undefined;
1972
1971
  const p_ein = (0, parser_utils_1.isNumericI7)(i7Data.p_ein) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_ein) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
1973
1972
  const q_ein = (0, parser_utils_1.isNumericI7)(i7Data.q_ein) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_ein) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
1973
+ const p_sKonst = (0, parser_utils_1.isNumericI7)(i7Data.p_bel) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_bel) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
1974
+ const q_sKonst = (0, parser_utils_1.isNumericI7)(i7Data.q_bel) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_bel) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
1975
+ const p_ki = (0, parser_utils_1.isNumericI7)(i7Data.p_ki) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_ki) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
1976
+ const q_ki = (0, parser_utils_1.isNumericI7)(i7Data.q_ki) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_ki) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
1974
1977
  const kr = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
1975
1978
  const r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r0) : undefined;
1976
1979
  const r1 = (0, parser_utils_1.isNumericI7)(i7Data.r1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r1) : undefined;
1977
1980
  const x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : undefined;
1978
1981
  const x1 = (0, parser_utils_1.isNumericI7)(i7Data.x1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x1) : undefined;
1979
1982
  const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EI']), i7Data.kurzname);
1980
- /*if(equivalentInjection.getUUID() === '41b1d0bf-2c36-4e34-aa2a-a283b8c32e7f'){
1981
- let stop = true;
1982
- }*/
1983
1983
  /** Export Extended Ward equivalent with voltage regulation */
1984
1984
  if (flag_lfl && !flag_ks && usoll && (r_ext !== 0 || x_ext !== 0)) {
1985
1985
  //is regulating equivalent equipment
1986
1986
  equivalentInjection.regulationCapability = true;
1987
+ equivalentInjection.minP = -9999;
1988
+ equivalentInjection.maxP = 9999;
1989
+ equivalentInjection.minQ = -9999;
1990
+ equivalentInjection.maxQ = 9999;
1987
1991
  equivalentInjection.regulationStatus = true;
1988
1992
  equivalentInjection.regulationTarget = usoll;
1989
1993
  equivalentInjection.rExt = r_ext;
@@ -1997,6 +2001,10 @@ class ConverterIntegral7 {
1997
2001
  }
1998
2002
  else if (flag_lfl && usoll && einspeisePrio) {
1999
2003
  equivalentInjection.regulationCapability = true;
2004
+ equivalentInjection.minP = -9999;
2005
+ equivalentInjection.maxP = 9999;
2006
+ equivalentInjection.minQ = -9999;
2007
+ equivalentInjection.maxQ = 9999;
2000
2008
  equivalentInjection.regulationStatus = true;
2001
2009
  equivalentInjection.regulationTarget = usoll;
2002
2010
  equivalentInjection.rExt = r_ext;
@@ -2041,6 +2049,14 @@ class ConverterIntegral7 {
2041
2049
  equivalentInjection.sk2 = sk2;
2042
2050
  equivalentInjection.p_ein = p_ein;
2043
2051
  equivalentInjection.q_ein = q_ein;
2052
+ equivalentInjection.p_bel = p_sKonst;
2053
+ equivalentInjection.q_bel = q_sKonst;
2054
+ equivalentInjection.p_ki = p_ki;
2055
+ equivalentInjection.q_ki = q_ki;
2056
+ const p = (p_ein ? p_ein : 0) + (p_sKonst ? p_sKonst : 0);
2057
+ const q = (q_ein ? q_ein : 0) + (q_sKonst ? q_sKonst : 0);
2058
+ equivalentInjection.p = p;
2059
+ equivalentInjection.p = q;
2044
2060
  equivalentInjection.einspeisePrio = einspeisePrio;
2045
2061
  equivalentInjection.kr = kr;
2046
2062
  equivalentInjection.aggregate = true; // default Wert im I7 Export. Not needed for EquivalentInjection, BusbarSection, PowerTransformerEnd, EquivalentShunt, EquivalentBranch
@@ -2767,10 +2783,6 @@ class ConverterIntegral7 {
2767
2783
  const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, typeName, this.configUuid);
2768
2784
  energySource.psrTypeUUID = psrType.mrid;
2769
2785
  }
2770
- if (typeName === 'Wasserkraft') {
2771
- energySource.activePower = 0;
2772
- energySource.reactivePower = 0;
2773
- }
2774
2786
  cimModel.addEnergySource(energySource);
2775
2787
  this.addIdMapping(i7Data.id, energySource.mrid, integral_sql_1.Integral7TableNames.EINSPEISUNG);
2776
2788
  }
@@ -6710,20 +6722,15 @@ function getGeoCoordinates(i7Data) {
6710
6722
  * 3-degree Gauss-Kruger zone 3 */
6711
6723
  if (i7Data.geokoor_gk_rechts && i7Data.geokoor_gk_hoch) {
6712
6724
  let epsg = '';
6713
- const gkZone = String(i7Data.geokoor_gk_rechts).charAt(0);
6714
- switch (gkZone) {
6715
- case '2': {
6716
- epsg = 'EPSG:31466';
6717
- }
6718
- case '3': {
6719
- epsg = 'EPSG:31467';
6720
- }
6721
- case '4': {
6722
- epsg = 'EPSG:31468';
6723
- }
6724
- default: {
6725
- console.log(`Unbekanntes Gauss-Kruger Koordinatenformat ${gkZone}`);
6726
- }
6725
+ const gkZone = String(i7Data.geokoor_gk_rechts);
6726
+ if (/^(2[0-9]{6})/.test(gkZone)) {
6727
+ epsg = 'EPSG:31466';
6728
+ }
6729
+ else if (/^(3[0-9]{6})/.test(gkZone)) {
6730
+ epsg = 'EPSG:31467';
6731
+ }
6732
+ else if (/^(4[0-9]{6})/.test(gkZone)) {
6733
+ epsg = 'EPSG:31468';
6727
6734
  }
6728
6735
  const points = geodata_util_1.GeodataUtil.convertPoint(+i7Data.geokoor_gk_rechts, +i7Data.geokoor_gk_hoch, epsg);
6729
6736
  return [String(points[0]), String(points[1])];