@enervance/insight-cim-model 0.0.161 → 0.0.162

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 (119) hide show
  1. package/dist/constants/cim-class-names.d.ts +10 -0
  2. package/dist/constants/cim-class-names.js +11 -1
  3. package/dist/constants/cim-class-names.js.map +1 -1
  4. package/dist/converter/integral7/converter.integral7.d.ts +3 -1
  5. package/dist/converter/integral7/converter.integral7.js +219 -243
  6. package/dist/converter/integral7/converter.integral7.js.map +1 -1
  7. package/dist/converter/integral7/dl-convert/data-manager.d.ts +1 -10
  8. package/dist/converter/integral7/dl-convert/data-manager.js +0 -34
  9. package/dist/converter/integral7/dl-convert/data-manager.js.map +1 -1
  10. package/dist/converter/integral7/dl-convert/db/data-types.d.ts +0 -9
  11. package/dist/converter/integral7/dl-convert/db/data-types.js +0 -11
  12. package/dist/converter/integral7/dl-convert/db/data-types.js.map +1 -1
  13. package/dist/converter/integral7/dl-convert/dl-converter-i7.d.ts +153 -99
  14. package/dist/converter/integral7/dl-convert/dl-converter-i7.js +3401 -1315
  15. package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
  16. package/dist/converter/integral7/dl-convert/executor.d.ts +3 -1
  17. package/dist/converter/integral7/dl-convert/executor.js +4 -3
  18. package/dist/converter/integral7/dl-convert/executor.js.map +1 -1
  19. package/dist/converter/integral7/model/dl-utils/util-functions.d.ts +7 -35
  20. package/dist/converter/integral7/model/dl-utils/util-functions.js +7 -659
  21. package/dist/converter/integral7/model/dl-utils/util-functions.js.map +1 -1
  22. package/dist/converter/integral7/{util-asset.model.d.ts → util-cim.model.d.ts} +5 -1
  23. package/dist/converter/integral7/{util-asset.model.js → util-cim.model.js} +10 -4
  24. package/dist/converter/integral7/util-cim.model.js.map +1 -0
  25. package/dist/converter/integral7/utils-cgmes-export.js +2 -0
  26. package/dist/converter/integral7/utils-cgmes-export.js.map +1 -1
  27. package/dist/converter/integral7/utils-trafo3w.d.ts +2 -2
  28. package/dist/converter/integral7/utils-trafo3w.js +21 -4
  29. package/dist/converter/integral7/utils-trafo3w.js.map +1 -1
  30. package/dist/converter/integral7/utils.d.ts +10 -22
  31. package/dist/converter/integral7/utils.js +187 -327
  32. package/dist/converter/integral7/utils.js.map +1 -1
  33. package/dist/etl/etl-dppower/etl-dppower.d.ts +15 -0
  34. package/dist/etl/etl-dppower/etl-dppower.js +204 -0
  35. package/dist/etl/etl-dppower/etl-dppower.js.map +1 -0
  36. package/dist/index.d.ts +2 -0
  37. package/dist/index.js +3 -0
  38. package/dist/index.js.map +1 -1
  39. package/dist/interfaces/model/wires/IRegulatingCondEq.d.ts +3 -0
  40. package/dist/model/assetinfo/CableInfo.d.ts +7 -0
  41. package/dist/model/assetinfo/CableInfo.js +49 -0
  42. package/dist/model/assetinfo/CableInfo.js.map +1 -1
  43. package/dist/model/assetinfo/OverheadWireInfo.d.ts +7 -0
  44. package/dist/model/assetinfo/OverheadWireInfo.js +49 -0
  45. package/dist/model/assetinfo/OverheadWireInfo.js.map +1 -1
  46. package/dist/model/assets/Facility.js +17 -3
  47. package/dist/model/assets/Facility.js.map +1 -1
  48. package/dist/model/assets/LifecycleDate.d.ts +1 -0
  49. package/dist/model/assets/LifecycleDate.js +3 -0
  50. package/dist/model/assets/LifecycleDate.js.map +1 -1
  51. package/dist/model/common/Location.js +1 -1
  52. package/dist/model/common/Location.js.map +1 -1
  53. package/dist/model/core/ACDCTerminal.js +2 -1
  54. package/dist/model/core/ACDCTerminal.js.map +1 -1
  55. package/dist/model/core/Equipment.js +6 -1
  56. package/dist/model/core/Equipment.js.map +1 -1
  57. package/dist/model/core/Substation.js +7 -7
  58. package/dist/model/core/Substation.js.map +1 -1
  59. package/dist/model/dc/DCLine.js +17 -17
  60. package/dist/model/dc/DCLineSegment.js +25 -25
  61. package/dist/model/diagram/DiagramObject.js +2 -2
  62. package/dist/model/diagram/DiagramObject.js.map +1 -1
  63. package/dist/model/equivalents/EquivalentInjection.d.ts +10 -0
  64. package/dist/model/equivalents/EquivalentInjection.js +111 -0
  65. package/dist/model/equivalents/EquivalentInjection.js.map +1 -1
  66. package/dist/model/extensions/amprion/core/AMPRIONBay.js.map +1 -1
  67. package/dist/model/extensions/enervance/assets/EVWireObject.js +7 -1
  68. package/dist/model/extensions/enervance/assets/EVWireObject.js.map +1 -1
  69. package/dist/model/extensions/integral/wires/INTEGRALAsynchronousMachine.d.ts +0 -1
  70. package/dist/model/extensions/integral/wires/INTEGRALAsynchronousMachine.js +0 -3
  71. package/dist/model/extensions/integral/wires/INTEGRALAsynchronousMachine.js.map +1 -1
  72. package/dist/model/extensions/neplan-westnetz/core/WNConnectivityNode.js +8 -1
  73. package/dist/model/extensions/neplan-westnetz/core/WNConnectivityNode.js.map +1 -1
  74. package/dist/model/loadmodel/ConformLoadGroup.js +22 -22
  75. package/dist/model/loadmodel/LoadArea.js +21 -21
  76. package/dist/model/loadmodel/SubLoadArea.js +22 -22
  77. package/dist/model/wires/ACLineSegment.d.ts +3 -0
  78. package/dist/model/wires/ACLineSegment.js +7 -1
  79. package/dist/model/wires/ACLineSegment.js.map +1 -1
  80. package/dist/model/wires/AsynchronousMachine.js +0 -1
  81. package/dist/model/wires/AsynchronousMachine.js.map +1 -1
  82. package/dist/model/wires/ExternalNetworkInjection.js.map +1 -1
  83. package/dist/model/wires/PowerTransformer.js +2 -0
  84. package/dist/model/wires/PowerTransformer.js.map +1 -1
  85. package/dist/model/wires/PowerTransformerEnd.js +1 -0
  86. package/dist/model/wires/PowerTransformerEnd.js.map +1 -1
  87. package/dist/model/wires/RatioTapChanger.js +1 -1
  88. package/dist/model-container/enum/EVSourceSystemKind.d.ts +1 -0
  89. package/dist/model-container/enum/EVSourceSystemKind.js +1 -0
  90. package/dist/model-container/enum/EVSourceSystemKind.js.map +1 -1
  91. package/dist/model-container/model/ModelContainer.d.ts +5 -0
  92. package/dist/model-container/model/ModelContainer.js +9 -0
  93. package/dist/model-container/model/ModelContainer.js.map +1 -1
  94. package/dist/util/util-create.d.ts +1 -1
  95. package/dist/util/util-create.js +4 -2
  96. package/dist/util/util-create.js.map +1 -1
  97. package/dist/util/utils.d.ts +1 -1
  98. package/dist/util/utils.js +4 -2
  99. package/dist/util/utils.js.map +1 -1
  100. package/dist/utils2/cim.model.utils.js +6 -0
  101. package/dist/utils2/cim.model.utils.js.map +1 -1
  102. package/dist/utils2/common.utils.d.ts +1 -0
  103. package/dist/utils2/common.utils.js +6 -2
  104. package/dist/utils2/common.utils.js.map +1 -1
  105. package/dist/utils2/fuseki.utils.js +7 -1
  106. package/dist/utils2/fuseki.utils.js.map +1 -1
  107. package/dist/utils2/import.utils.d.ts +2 -1
  108. package/dist/utils2/import.utils.js +9 -3
  109. package/dist/utils2/import.utils.js.map +1 -1
  110. package/dist/utils2/parser.utils.js +7 -7
  111. package/dist/utils2/parser.utils.js.map +1 -1
  112. package/package.json +5 -2
  113. package/dist/converter/integral7/dl-convert/dl-converter-i7-2.d.ts +0 -157
  114. package/dist/converter/integral7/dl-convert/dl-converter-i7-2.js +0 -3521
  115. package/dist/converter/integral7/dl-convert/dl-converter-i7-2.js.map +0 -1
  116. package/dist/converter/integral7/dl-convert/dl-converter-i7.types.d.ts +0 -3
  117. package/dist/converter/integral7/dl-convert/dl-converter-i7.types.js +0 -3
  118. package/dist/converter/integral7/dl-convert/dl-converter-i7.types.js.map +0 -1
  119. package/dist/converter/integral7/util-asset.model.js.map +0 -1
@@ -1,9 +1,8 @@
1
1
  import { ILogger } from '../../../interfaces/ILogger.js';
2
2
  import { i7SchemaKeyDefinitions, I7TableSchemas } from './dl-graphs/convert-graph-keys.js';
3
- import { DbObjectGraph, DbObjectGraphType } from './dl-graphs/db-object-graph.js';
3
+ import { DbObjectGraph } from './dl-graphs/db-object-graph.js';
4
4
  import { MysqlController } from '../../../util/database/mysql-controller.js';
5
5
  import { CimModelGraph, DbObjectKey2CimModelUUIDGraph } from './dl-graphs/cim-model-graph.js';
6
- import { I7ExportFrame } from '../interface-i7/export-frame-i7.js';
7
6
  export type LoadFromMySQLOptions = {
8
7
  [tableName in keyof I7TableSchemas]?: {
9
8
  [tableColumnName in keyof I7TableSchemas[tableName]]?: {
@@ -12,10 +11,6 @@ export type LoadFromMySQLOptions = {
12
11
  };
13
12
  };
14
13
  };
15
- export type DataManagerOptions = {
16
- /** purge the graphs before loading the data, if false, the data will be merged */
17
- purgeData?: boolean;
18
- };
19
14
  export declare class DataManager {
20
15
  private logger;
21
16
  dbObjectGraph: DbObjectGraph<I7TableSchemas, typeof i7SchemaKeyDefinitions>;
@@ -26,8 +21,4 @@ export declare class DataManager {
26
21
  setCimModelGraph(graph: CimModelGraph): void;
27
22
  setDbObjectKeyCimModelUuidGraph(graph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>): void;
28
23
  loadFromMySQL(mysqlController: MysqlController, options: LoadFromMySQLOptions): Promise<void>;
29
- mergeConverterFrame(frame: I7ExportFrame, integralID2UUID: Map<number, string>): void;
30
- loadDataFromJSON(data: any): DbObjectGraphType<I7TableSchemas, typeof i7SchemaKeyDefinitions>;
31
- private addIntegralID2UUIDs;
32
- private mergeIntegral7IdOnlyDataMap;
33
24
  }
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DataManager = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const convert_graph_keys_1 = require("./dl-graphs/convert-graph-keys.js");
6
- const db_object_graph_1 = require("./dl-graphs/db-object-graph.js");
7
6
  const executor_1 = require("./executor.js");
8
7
  class DataManager {
9
8
  constructor(logger) {
@@ -64,39 +63,6 @@ class DataManager {
64
63
  }
65
64
  });
66
65
  }
67
- mergeConverterFrame(frame, integralID2UUID) {
68
- for (const uuid of frame.cimModel.objects.keys()) {
69
- this.cimModelGraph.addUnspecifiedObject(uuid, frame.cimModel.objects.get(uuid));
70
- }
71
- this.addIntegralID2UUIDs(integralID2UUID);
72
- // this.mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, frame.integral7Modell.integralStandorte, i7TableNames.netz_standort);
73
- // this.mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, frame.integral7Modell.integralSchaltanlagen, i7TableNames.netz_schaltanlage);
74
- // this.mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, frame.integral7Modell.integralHgueKopf, i7TableNames['*']);
75
- // this.mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, frame.integral7Modell.integralSchaltanlagenAbschnitte, i7TableNames.netz);
76
- // this.mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, frame.integral7Modell.integralSchaltfelder, i7TableNames['*']);
77
- // this.mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, frame.integral7Modell.integralKnotenSo, i7TableNames.n);
78
- // this.mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, frame.integral7Modell.integralLeitungen, i7TableNames.netz_leitung);
79
- // this.mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, frame.integral7Modell.integralLaengskupplungen, i7TableNames['*']);
80
- // this.mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, frame.integral7Modell.integralHgueLeitungen, i7TableNames['*']);
81
- }
82
- loadDataFromJSON(data) {
83
- // todo
84
- const graph = new db_object_graph_1.DbObjectGraph(convert_graph_keys_1.i7SchemaKeyDefinitions);
85
- return {};
86
- }
87
- addIntegralID2UUIDs(integralID2UUID) {
88
- for (const integralID2UUIDEntry of integralID2UUID.entries()) {
89
- this.dbObjectKeyCimModelUuidGraph.addRelation(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: integralID2UUIDEntry[0] }, integralID2UUIDEntry[1]);
90
- }
91
- }
92
- mergeIntegral7IdOnlyDataMap(frame, integralID2UUID, i7DataMap, tableName) {
93
- for (const idIntegralObject of i7DataMap.entries()) {
94
- // this.dbObjectKeyCimModelUuidGraph.addRelation(
95
- // i7SchemaKeyNames.IdOnlyKey, { id: idIntegralObject[0] }, integralID2UUID.get(idIntegralObject[0])
96
- // );
97
- this.dbObjectGraph.addObject(tableName, convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, idIntegralObject[1]);
98
- }
99
- }
100
66
  }
101
67
  exports.DataManager = DataManager;
102
68
  //# sourceMappingURL=data-manager.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../src/converter/integral7/dl-convert/data-manager.ts"],"names":[],"mappings":";;;;AACA,uEAOwC;AAKxC,yCAAsC;AAWtC,MAAa,WAAW;IAOtB,YAAY,MAAgB;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,gBAAgB,CAAC,KAAmE;QAClF,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,KAAoB;QACnC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,+BAA+B,CAAC,KAAmE;QACjG,IAAI,CAAC,4BAA4B,GAAG,KAAK,CAAC;IAC5C,CAAC;IAEK,aAAa,CAAC,eAAgC,EAAE,OAA6B;;;YACjF,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,gBAAgB,EAAE,CAAC;YAE/D,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;gBAC/B,IAAI,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;oBAChC,wBAAwB;oBACxB,IAAI,0BAA0B,GAAG,EAAE,CAAC;oBACpC,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;wBAC3C,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAG,EAAC,oDAAoD;4BAC3F,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gCAC/D,OAAO,GAAG,UAAU,MAAM,GAAG,EAAE,CAAA;4BACjC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BAChB,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;yBAC/C;6BAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAG,EAAC,oDAAoD;4BAClG,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BAClE,0BAA0B,CAAC,IAAI,CAAC,IAAI,UAAU,QAAQ,YAAY,GAAG,CAAC,CAAC;yBACxE;qBACF;oBACD,IAAI,WAAW,GAAG;kCACQ,SAAS,EAAE,CAAC;oBACtC,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzC,WAAW,IAAI,UAAU,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;qBACrE;oBACD,WAAW,IAAI,GAAG,CAAA;oBAClB,sBAAsB;oBAEtB,IAAI;wBACF,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;wBAElE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,mCAAI,EAAE,CAAC;wBAEpE,IAAI,CAAC,aAAa,CAAC,UAAU,CAC3B,SAAkC,EAAE,8CAAyB,CAAC,SAAS,CAAC,EAAE,YAAY,CACvF,CAAC;qBACH;oBAAC,OAAO,CAAC,EAAE;wBACV,4BAA4B;wBAC5B,mGAAmG;wBACnG,qDAAqD;wBACrD,0FAA0F;wBAC1F,kCAAkC;wBAClC,IAAG,CAAC,mBAAQ,CAAC,eAAe,EAAC;4BAC3B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;yBAChB;qBACF;iBACF;aACF;;KACF;CACF;AAtED,kCAsEC"}
@@ -1,12 +1,3 @@
1
- export declare enum DataTypes {
2
- NSG_SSAB = "NSG_SSAB",
3
- NSG_NODE = "NSG_NODE",
4
- NSG_STANDORT = "NSG_STANDORT",
5
- NSG_TRAFO2W = "NSG_TRAFO2W",
6
- NSG_TRAFO3W = "NSG_TRAFO3W",
7
- NSG_LEITUNG = "NSG_LEITUNG",
8
- NSG_QUERZWEIG = "NSG_QUERZWEIG"
9
- }
10
1
  export type VariantenNrIdKey = {
11
2
  variantennr: number;
12
3
  id: number;
@@ -1,14 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.DataTypes = void 0;
4
- var DataTypes;
5
- (function (DataTypes) {
6
- DataTypes["NSG_SSAB"] = "NSG_SSAB";
7
- DataTypes["NSG_NODE"] = "NSG_NODE";
8
- DataTypes["NSG_STANDORT"] = "NSG_STANDORT";
9
- DataTypes["NSG_TRAFO2W"] = "NSG_TRAFO2W";
10
- DataTypes["NSG_TRAFO3W"] = "NSG_TRAFO3W";
11
- DataTypes["NSG_LEITUNG"] = "NSG_LEITUNG";
12
- DataTypes["NSG_QUERZWEIG"] = "NSG_QUERZWEIG";
13
- })(DataTypes = exports.DataTypes || (exports.DataTypes = {}));
14
3
  //# sourceMappingURL=data-types.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"data-types.js","sourceRoot":"","sources":["../../../../../src/converter/integral7/dl-convert/db/data-types.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAQX;AARD,WAAY,SAAS;IACnB,kCAAqB,CAAA;IACrB,kCAAqB,CAAA;IACrB,0CAA6B,CAAA;IAC7B,wCAA2B,CAAA;IAC3B,wCAA2B,CAAA;IAC3B,wCAA2B,CAAA;IAC3B,4CAA+B,CAAA;AACjC,CAAC,EARW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAQpB"}
1
+ {"version":3,"file":"data-types.js","sourceRoot":"","sources":["../../../../../src/converter/integral7/dl-convert/db/data-types.ts"],"names":[],"mappings":""}
@@ -1,106 +1,160 @@
1
- import { MysqlController } from '../../../util/database/mysql-controller.js';
2
- import { IdentifiedObject } from '../../../model/core/IdentifiedObject.js';
3
1
  import { ILogger } from '../../../interfaces/ILogger.js';
4
- import { NsgObject } from './db/database.interface.types.js';
2
+ import { NetzKnoten, NetzLKupplung, NetzStreckenlast, Netzvariante, NsgKnotenHgue, NsgKnotenSo, NsgKpFeld, NsgLeitung, NsgLKondensator, NsgLKupplung, NsgLKupplungRss, NsgQuerzweig, NsgQuerzweigqzcont, NsgSaabschnitt, NsgSchaltanlage, NsgSchaltfeld, NsgStandort, NsgStpimpedanz, NsgStpknoten, NsgStpschaltfeld, NsgStpschiene, NsgTrafo2W, NsgTrafo3W } from './db/database.interface.types.js';
5
3
  import { DiagramObject } from '../../../model/diagram/DiagramObject.js';
6
- import { SchaltfeldImpl } from '../model/integral/Schaltfeld.js';
7
- import { LaengskupplungImpl } from '../model/integral/Laengskupplung.js';
8
- import { PowerTransformer } from '../../../model/wires/PowerTransformer.js';
9
- import { Hgueleitung } from '../model/interfaces.js';
10
- import { PowerTransformerEnd } from '../../../model/wires/PowerTransformerEnd.js';
11
- import { LeitungImpl } from '../model/integral/Leitung.js';
12
- import { ModelContainer } from '../../../model-container/model/ModelContainer.js';
13
- import { IUUIDObject } from '../../../interfaces/IUUIDObject.js';
14
- import { ILine } from '../../../interfaces/model/wires/ILine.js';
15
- type SchemaInputParamsType = {
16
- standortIDs: number[];
17
- schaltanlagenIDs: number[];
18
- schaltanlagenAbschnittIDs: number[];
19
- schaltfeldIDs: number[];
20
- knotenSoIDs: number[];
21
- querkupplungIDs: number[];
22
- laengskupplungIDs: number[];
23
- integralID2UUID: Map<number, string>;
24
- integralSchaltfelder: Map<number, SchaltfeldImpl>;
25
- integralLaengskupplungen: Map<number, LaengskupplungImpl>;
26
- integralLeitungen: Map<number, LeitungImpl>;
27
- integralHgueLeitungen: Map<number, Hgueleitung>;
28
- powerTransformers: ReadonlyMap<string, PowerTransformer>;
29
- powerTransformerEnds: ReadonlyMap<string, PowerTransformerEnd>;
30
- lines: ReadonlyMap<string, ILine>;
31
- objects: ReadonlyMap<string, IUUIDObject>;
32
- };
33
- type CimUUIDsEntry = {
34
- identifiedObjectUUID: string;
35
- diagramObjectUUID?: string;
36
- };
37
- type I7SchemaKeyObject = {
38
- i7ID: number;
39
- variantenNr: number;
40
- additionalIDs?: number[];
4
+ import { i7SchemaKeyDefinitions, I7TableSchemas } from './dl-graphs/convert-graph-keys.js';
5
+ import { Diagram } from '../../../model/diagram/Diagram.js';
6
+ import { CimModelGraph, DbObjectKey2CimModelUUIDGraph } from './dl-graphs/cim-model-graph.js';
7
+ import { DbObjectGraph } from './dl-graphs/db-object-graph.js';
8
+ import { VariantenNrIdKey } from './db/data-types.js';
9
+ import { IUuidConfig } from '../interface-i7/uuid-config.interface.js';
10
+ type DLConverterI7Config = {
11
+ busbarSectionAsConnectivityNode: boolean;
41
12
  };
42
13
  export declare class DLConverterI7 {
43
- /** key: VariantenNr (integral7) | value: corresponding diagram */
44
- private static variantenNr2Diagram;
45
- /** key: Data-Type | value: Array of JSON-stringified I7SchemaKeyObjects */
46
- private static type2i7IDs;
47
- /** key: JSON-stringified I7SchemaKeyObject | value: CimUUIDsEntry */
48
- private static i7ID2cimUUIDs;
49
- /** key: JSON-stringified I7SchemaKeyObject | value: Data-Type */
50
- private static i7ID2Type;
51
- /** key: JSON-stringified I7SchemaKeyObject | value: schema database object (integral) */
52
- private static i7ID2DbNsgObject;
53
- /** key: uuid of cim-net object or diagram object | value: JSON-stringified I7SchemaKeyObject */
54
- private static cimUUID2i7ID;
55
- private static cimUUID2Object;
56
- private static cimUUID2DiagramObject;
57
- private i7TableName2Table;
58
- private mysqlController;
59
14
  private logger;
60
- private activeDiagram;
61
- private inputArgs;
62
- /** key: JSON-stringified I7SchemaKeyObject | value: schema database object (integral) */
63
- private static i7ID2DbNsgObjectInFrame;
64
- /** this flag is being used for testings, so that the data is not being purged and can be simply checked afterwards */
65
- static purgeData: boolean;
66
- static cimModelObjects: ModelContainer;
67
- constructor();
68
- static addCimObjects(...objs: IdentifiedObject[]): void;
69
- static getCimObjectByUUID(uuid: string): IdentifiedObject;
70
- static getDiagramObjectByUUID(uuid: string): DiagramObject;
71
- static createSchemaKeyObject(arg: I7SchemaKeyObject): string;
72
- static parseSchemaKeyObject(key: any): I7SchemaKeyObject;
73
- static addIDsRelationMapping(i7ID: any, cimUUIDs: CimUUIDsEntry): void;
74
- static addID2TypeMapping(i7ID: any, tpe: string): void;
75
- static addID2DbNsgObjectMapping(i7ID: any, dbNsgObject: NsgObject): void;
76
- static getDbNsgObjectByID<T extends NsgObject>(i7ID: any): T;
77
- cleanUp(): void;
78
- private cleanUpAfterVariantConvert;
79
- prepare(mysqlController: MysqlController, logger: ILogger): void;
80
- static getI7ID2DiagramObjectMap(): ReadonlyMap<string, DiagramObject>;
81
- addCimObjects2Model(cimModel: ModelContainer): void;
82
- convert(availableTablesWithColumnNames: Map<string, string[]>, onlyEingeblendet: boolean, args: SchemaInputParamsType): Promise<void>;
83
- private convertNsgVarianten;
84
- /** Register the NsgObject and perform a type mapping. Returns a SchemaKeyObject*/
85
- private static registerNsgObjectAndGetSchemaKay;
86
- private convertSchemaStandorte;
87
- private convertSchemaKnotenSo;
88
- private convertSchemaSchaltanlage;
89
- private convertSchemaSchaltanlagenAbschnitte;
90
- private convertSchemaSammelschienenAbschnitte;
91
- private convertSchemaSchaltfeldElemente;
92
- private convertSchemaQuerkupplungen;
93
- private convertSchemaLaengskupplungen;
94
- private convertSchemaTransformatoren2W;
95
- convertSchemaTransformatoren3W(variantenNr: number, onlyEingeblendet: boolean, powerTransformers: ReadonlyMap<string, PowerTransformer>): Promise<void>;
96
- convertSchemaLeitungen(variantenNr: number, onlyEingeblendet: boolean): Promise<void>;
97
- convertSchemaQuerzweige(variantenNr: number, onlyEingeblendet: boolean): Promise<void>;
98
- convertSchemaTerminals(): void;
99
- private convertTerminal;
100
- private convertBusbarSectionCNTerminal;
101
- private filterTablesByAvailability;
102
- private isTableAvailable;
103
- private getAvailableColumnNames;
104
- private runAndLogPerformance;
15
+ private configUuid;
16
+ static testmode: boolean;
17
+ private config;
18
+ private dbObjectGraph;
19
+ private dbObjectKeyCimModelUuidGraph;
20
+ private cimModelGraph;
21
+ private exportedTerminalUUIDs;
22
+ private exportedBusbarSectionConnectivityNodeUuidToDiagramObject;
23
+ exportedDiagramObjectsGraph: {
24
+ [variantenNr: number | string]: {
25
+ [netzId: number | string]: DiagramObject;
26
+ };
27
+ };
28
+ constructor(configUuid: Array<IUuidConfig>, logger?: ILogger, config?: DLConverterI7Config);
29
+ addExportedDiagramObjectToGraph(variantennr: number, netzId: number, diagramObject: DiagramObject): void;
30
+ setDbObjectGraph(graph: DbObjectGraph<I7TableSchemas, typeof i7SchemaKeyDefinitions>): void;
31
+ setCimModelGraph(graph: CimModelGraph): void;
32
+ setDbObjectKeyCimModelUuidGraph(graph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>): void;
33
+ addCimObject<K extends typeof i7SchemaKeyDefinitions, KN extends keyof typeof i7SchemaKeyDefinitions & string>(uuid: string, object: any, typeOfKey?: KN, dbKey?: K[KN]): void;
34
+ /**
35
+ * convertNsgVariante
36
+ */
37
+ convertNsgVariante(arg: Netzvariante): Promise<Diagram | null>;
38
+ /**
39
+ * convertSchemaStandort
40
+ */
41
+ convertSchemaStandort(arg: NsgStandort): Promise<void>;
42
+ /**
43
+ * convertSchemaKnotenStandort
44
+ */
45
+ convertSchemaKnotenStandort(nsgKnotenSo: NsgKnotenSo): Promise<DiagramObject | null>;
46
+ /**
47
+ * convertSchemaKnotenStandort
48
+ */
49
+ convertSchemaKnotenHgue(nsgKnotenHgue: NsgKnotenHgue): Promise<DiagramObject | null>;
50
+ /**
51
+ * convertSchemaSchaltanlage
52
+ */
53
+ convertSchemaSchaltanlage(arg: NsgSchaltanlage): Promise<void>;
54
+ /**
55
+ * convertSchemaSchaltanlagenAbschnitte
56
+ */
57
+ convertSchemaSchaltanlagenAbschnitte(arg: NsgSaabschnitt): Promise<void>;
58
+ convertSchemaSammelschienenAbschnitte(arg: NsgSaabschnitt): Promise<DiagramObject[]>;
59
+ /**
60
+ * convertSchemaSammelschienenAbschnitt
61
+ */
62
+ private convertSchemaSammelschienenAbschnitt;
63
+ /**
64
+ * convertSchemaSchaltfeldElemente
65
+ */
66
+ convertSchemaSchaltfeldElemente(nsgSchaltfeld: NsgSchaltfeld): Promise<DiagramObject[]>;
67
+ /**
68
+ * convertSchemaTransformer2W
69
+ */
70
+ convertSchemaTransformer2W(nsgTrafo2w: NsgTrafo2W): Promise<DiagramObject[] | null>;
71
+ /**
72
+ * convertSchemaTransformer3W
73
+ */
74
+ convertSchemaTransformer3W(nsgTrafo3w: NsgTrafo3W): Promise<DiagramObject[] | null>;
75
+ private lookupTransformerEndTerminalUUIDBy;
76
+ /**
77
+ * getConnectivityNodePositionFor
78
+ */
79
+ getConnectivityNodePositionFor(i7ObjectType: string, object: any): Promise<number[]>;
80
+ /**
81
+ * convertSchemaLeitung
82
+ */
83
+ convertSchemaLeitung(nsgLeitung: NsgLeitung, splitLine?: boolean): Promise<DiagramObject[] | null>;
84
+ /**
85
+ * convertSchemaQuerzweig
86
+ */
87
+ convertSchemaQuerzweig(nsgQuerzweig: NsgQuerzweig): Promise<DiagramObject[] | null>;
88
+ /**
89
+ * convertNsgLeitungStreckenlast
90
+ */
91
+ convertNsgLeitungStreckenlast(nsgLeitung: NsgLeitung, netzStreckenlast: NetzStreckenlast, splitLine?: boolean): Promise<DiagramObject[] | null>;
92
+ /**
93
+ * convertSchemaQuerzweigqcont
94
+ */
95
+ convertSchemaQuerzweigqzcont(nsgQuerzweigqzcont: NsgQuerzweigqzcont): Promise<DiagramObject[] | null>;
96
+ /**
97
+ * convertSchemaNsgLKupplungRss
98
+ */
99
+ convertSchemaNsgLKupplungRss(nsgLKupplungRss: NsgLKupplungRss): Promise<DiagramObject[] | null>;
100
+ /**
101
+ * getRelPos
102
+ */
103
+ getRelPos(nsgLeitung: NsgLeitung, aknoten: boolean): Promise<number[] | null>;
104
+ /**
105
+ * convertSchemaKpfeld
106
+ */
107
+ convertSchemaKpfeld(nsgKpfeld: NsgKpFeld): Promise<DiagramObject[] | null>;
108
+ /**
109
+ * convertSchemaLKupplung
110
+ */
111
+ convertSchemaLKupplung(nsgLKupplung: NsgLKupplung, netzLKupplung: NetzLKupplung): Promise<DiagramObject[] | null>;
112
+ /**
113
+ * convertSchemaStpschiene
114
+ */
115
+ convertSchemaLKondensator(nsgLKondensator: NsgLKondensator): Promise<DiagramObject[]>;
116
+ /**
117
+ * convertSchemaStpschiene
118
+ */
119
+ convertSchemaStpschiene(nsgStpschiene: NsgStpschiene): Promise<DiagramObject[]>;
120
+ /**
121
+ * convertSchemaStpknoten
122
+ */
123
+ convertSchemaStpknoten(nsgStpknoten: NsgStpknoten): Promise<DiagramObject[]>;
124
+ /**
125
+ * convertSchemaStpimpedanz
126
+ */
127
+ convertSchemaStpimpedanz(nsgStpimpedanz: NsgStpimpedanz): Promise<DiagramObject[]>;
128
+ /**
129
+ * convertSchemaStpschaltfeld
130
+ */
131
+ convertSchemaStpschaltfeldElemente(nsgStpschaltfeld: NsgStpschaltfeld): Promise<DiagramObject[]>;
132
+ /**
133
+ * convertSchemaStp*-Terminals
134
+ */
135
+ convertSchemaStpTerminals(nsgStpknoten: NsgStpknoten): Promise<DiagramObject[]>;
136
+ getLeftUpperCornerOfUnspecified(variantennr: number, id: number): Promise<number[]>;
137
+ getLeftUpperCornerOf(i7ObjectType: string, object: any, variantennr?: number): Promise<number[]>;
138
+ getLeftUpperCornerOfLKupplungRssElement(nsgLKupplungRss: NsgLKupplungRss, cornerOf: {
139
+ slot_anf?: boolean;
140
+ slot_end?: boolean;
141
+ self?: boolean;
142
+ }): Promise<number[]>;
143
+ getNodesOfSchaltfeld(arg: NsgSchaltfeld): Promise<NetzKnoten[]>;
144
+ getNodesOfKpfeld(arg: NsgKpFeld): Promise<NetzKnoten[]>;
145
+ getNodesOfLKupplung(arg: NetzLKupplung): Promise<NetzKnoten[]>;
146
+ /** */
147
+ getSizeOfSchaltanlage(arg: NsgSchaltanlage): Promise<number>;
148
+ getMaxPosOfSaabschnitt(nsgSaabschnitt: NsgSaabschnitt): Promise<number>;
149
+ getLengthOfSammelschienenAbschnitt(nsgSaab: NsgSaabschnitt): Promise<number>;
150
+ getMaxLengthOfKuppelfeld(schaltanlagenabschnittKey: VariantenNrIdKey): Promise<number>;
151
+ getMaxLengthOfSchaltfeld(schaltanlagenabschnittKey: VariantenNrIdKey): Promise<number>;
152
+ private lookupTerminalUUID;
153
+ /**
154
+ * returns three Uuids if those two ConductingEquipments are connected with each other
155
+ * result is either [Terminal-UUID, ConnectivityNode-UUID, Terminal-UUID] or []
156
+ */
157
+ private findConnectionAsUuidsBetweenTwoConductingEquipments;
158
+ private createTerminalDiagramObjectFromPoints;
105
159
  }
106
160
  export {};