@enervance/insight-cim-model 0.0.206 → 0.0.208-dev
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.
- package/dist/converter/integral7/converter.integral7.js +32 -17
- package/dist/converter/integral7/converter.integral7.js.map +1 -1
- package/dist/converter/integral7/dl-convert/data-manager.d.ts +1 -4
- package/dist/converter/integral7/dl-convert/data-manager.js +37 -43
- package/dist/converter/integral7/dl-convert/data-manager.js.map +1 -1
- package/dist/converter/integral7/dl-convert/dl-converter-i7.d.ts +6 -4
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js +69 -57
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.d.ts +0 -10
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js +1 -43
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js.map +1 -1
- package/dist/converter/integral7/dl-convert/executor.d.ts +1 -1
- package/dist/converter/integral7/dl-convert/executor.js +42 -36
- package/dist/converter/integral7/dl-convert/executor.js.map +1 -1
- package/dist/converter/integral7/interface-i7/data-structures-i7.d.ts +0 -23
- package/dist/converter/integral7/interface-i7/export-frame-i7.d.ts +0 -22
- package/dist/converter/integral7/interface-i7/export-frame-i7.js +6 -39
- package/dist/converter/integral7/interface-i7/export-frame-i7.js.map +1 -1
- package/dist/converter/integral7/model/dl-utils/util-functions.d.ts +2 -0
- package/dist/converter/integral7/model/dl-utils/util-functions.js +8 -0
- package/dist/converter/integral7/model/dl-utils/util-functions.js.map +1 -1
- package/dist/converter/integral7/utils.d.ts +5 -0
- package/dist/converter/integral7/utils.js +20 -1
- package/dist/converter/integral7/utils.js.map +1 -1
- package/dist/model/dc/DCTerminal.js +1 -1
- package/dist/model/dc/DCTerminal.js.map +1 -1
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.d.ts +2 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js +6 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js.map +1 -1
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.d.ts +2 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js +6 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js.map +1 -1
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformerInfo.d.ts +2 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformerInfo.js +6 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformerInfo.js.map +1 -1
- package/dist/model/market-management/TimeSeries.d.ts +2 -2
- package/dist/model/market-management/TimeSeries.js +3 -3
- package/dist/model/market-management/TimeSeries.js.map +1 -1
- package/dist/utils2/common.utils.js +3 -0
- package/dist/utils2/common.utils.js.map +1 -1
- package/package.json +2 -1
|
@@ -22,16 +22,13 @@ const cim_class_names_1 = require("../../../constants/cim-class-names.js");
|
|
|
22
22
|
const util_create_1 = require("../../../util/util-create.js");
|
|
23
23
|
class DLConverterI7 {
|
|
24
24
|
constructor(configUuid, logger, config) {
|
|
25
|
-
// private exportedBusbarSectionConnectivityNodeUuidToDiagramObject: Map<string, DiagramObject>;
|
|
26
25
|
this.exportedDiagramObjectsGraph = {};
|
|
27
26
|
this.configUuid = configUuid;
|
|
28
27
|
this.logger = logger;
|
|
29
28
|
this.config = config;
|
|
30
29
|
this.dbObjectGraph = new db_object_graph_1.DbObjectGraph(convert_graph_keys_1.i7SchemaKeyDefinitions);
|
|
31
|
-
this.dbObjectKeyCimModelUuidGraph = new cim_model_graph_1.DbObjectKey2CimModelUUIDGraph(convert_graph_keys_1.i7SchemaKeyDefinitions);
|
|
32
30
|
this.cimModelGraph = new cim_model_graph_1.CimModelGraph();
|
|
33
31
|
this.exportedTerminalUUIDs = new Set();
|
|
34
|
-
// this.exportedBusbarSectionConnectivityNodeUuidToDiagramObject = new Map();
|
|
35
32
|
util_functions_1.DLUtilFunctions.setUuidNamespaces(this.configUuid);
|
|
36
33
|
}
|
|
37
34
|
addExportedDiagramObjectToGraph(variantennr, netzId, diagramObject) {
|
|
@@ -51,22 +48,26 @@ class DLConverterI7 {
|
|
|
51
48
|
setCimModelGraph(graph) {
|
|
52
49
|
this.cimModelGraph = graph;
|
|
53
50
|
}
|
|
54
|
-
setDbObjectKeyCimModelUuidGraph(graph) {
|
|
55
|
-
this.dbObjectKeyCimModelUuidGraph = graph;
|
|
56
|
-
}
|
|
57
51
|
addCimObject(uuid, object, typeOfKey, dbKey) {
|
|
58
52
|
// todo remove call from test
|
|
59
|
-
// if (typeOfKey !== undefined && dbKey !== undefined) this.
|
|
53
|
+
// if (typeOfKey !== undefined && dbKey !== undefined) this.addRelation(typeOfKey, dbKey, uuid);
|
|
60
54
|
// this.cimModelGraph.addUnspecifiedObject(uuid, object);
|
|
61
55
|
}
|
|
62
56
|
/**
|
|
63
57
|
* convertNsgVariante
|
|
64
58
|
*/
|
|
65
59
|
convertNsgVariante(arg, tsoName) {
|
|
60
|
+
var _a;
|
|
66
61
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
67
62
|
const diagram = new Diagram_1.Diagram((0, parser_utils_1.getUUID)(arg.guid), (0, util_create_1.createNotation)([arg.name, '_', tsoName], 32, true), String(arg.id));
|
|
68
63
|
diagram.orientation = OrientationKind_1.OrientationKind.negative;
|
|
69
|
-
|
|
64
|
+
let uuid;
|
|
65
|
+
if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.generateUUID4) {
|
|
66
|
+
uuid = common_utils_1.CommonUtils.generateUUID();
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramStyle, this.configUuid, cim_constants_1.DiagramLayoutTypes.NODE_BREAKER);
|
|
70
|
+
}
|
|
70
71
|
diagram.diagramStyle = new DiagramStyle_1.DiagramStyle(uuid, cim_constants_1.DiagramLayoutTypes.NODE_BREAKER);
|
|
71
72
|
return diagram;
|
|
72
73
|
});
|
|
@@ -82,12 +83,12 @@ class DLConverterI7 {
|
|
|
82
83
|
* convertSchemaKnotenStandort
|
|
83
84
|
*/
|
|
84
85
|
convertSchemaKnotenStandort(nsgKnotenSo) {
|
|
85
|
-
var _a
|
|
86
|
+
var _a;
|
|
86
87
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
87
88
|
const nsgStandort = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgstandort, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgKnotenSo.variantennr, id: nsgKnotenSo.nsgso });
|
|
88
89
|
if (nsgStandort === undefined)
|
|
89
90
|
return null;
|
|
90
|
-
const cimObjectUUID = (
|
|
91
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgKnotenSo.knotenso })) !== null && _a !== void 0 ? _a : undefined;
|
|
91
92
|
const diagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
92
93
|
xPosition: nsgStandort.xrel + nsgKnotenSo.xrel + 16,
|
|
93
94
|
yPosition: nsgStandort.yrel + nsgKnotenSo.yrel + 16,
|
|
@@ -111,12 +112,12 @@ class DLConverterI7 {
|
|
|
111
112
|
* convertSchemaKnotenStandort
|
|
112
113
|
*/
|
|
113
114
|
convertSchemaKnotenHgue(nsgKnotenHgue) {
|
|
114
|
-
var _a
|
|
115
|
+
var _a;
|
|
115
116
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
116
117
|
const nsgStandort = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgstandort, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgKnotenHgue.variantennr, id: nsgKnotenHgue.nsgso });
|
|
117
118
|
if (nsgStandort === undefined)
|
|
118
119
|
return null;
|
|
119
|
-
const cimObjectUUID = (
|
|
120
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgKnotenHgue.knotenso })) !== null && _a !== void 0 ? _a : undefined;
|
|
120
121
|
const diagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
121
122
|
xPosition: nsgStandort.xrel + nsgKnotenHgue.xrel + 16,
|
|
122
123
|
yPosition: nsgStandort.yrel + nsgKnotenHgue.yrel + 16,
|
|
@@ -177,7 +178,7 @@ class DLConverterI7 {
|
|
|
177
178
|
* convertSchemaSammelschienenAbschnitt
|
|
178
179
|
*/
|
|
179
180
|
convertSchemaSammelschienenAbschnitt(nsgSaabschnitt, netzSsab) {
|
|
180
|
-
var _a, _b
|
|
181
|
+
var _a, _b;
|
|
181
182
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
182
183
|
const nsgSchaltanlage = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgschaltanlage, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgSaabschnitt.variantennr, id: nsgSaabschnitt.nsgsa });
|
|
183
184
|
if (!nsgSchaltanlage)
|
|
@@ -200,7 +201,7 @@ class DLConverterI7 {
|
|
|
200
201
|
topLeft.sequenceNumber = 1;
|
|
201
202
|
bottomRight.sequenceNumber = 2;
|
|
202
203
|
points.push(topLeft, bottomRight);
|
|
203
|
-
const cimObjectUUID = (
|
|
204
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: netzSsab.id })) !== null && _a !== void 0 ? _a : undefined;
|
|
204
205
|
const connectivityNode = this.cimModelGraph.findObjectByUUID(cimObjectUUID);
|
|
205
206
|
let busbarSection = null;
|
|
206
207
|
let busbarSectionTerminal = null;
|
|
@@ -213,7 +214,7 @@ class DLConverterI7 {
|
|
|
213
214
|
}
|
|
214
215
|
}
|
|
215
216
|
}
|
|
216
|
-
if (busbarSection && busbarSectionTerminal && !((
|
|
217
|
+
if (busbarSection && busbarSectionTerminal && !((_b = this.config) === null || _b === void 0 ? void 0 : _b.busbarSectionAsConnectivityNode)) {
|
|
217
218
|
// compute the position for the ConnectivityNode (the center of the BusbarSection)
|
|
218
219
|
const centerPosition = [
|
|
219
220
|
(topLeft.xPosition + bottomRight.xPosition) / 2,
|
|
@@ -248,7 +249,7 @@ class DLConverterI7 {
|
|
|
248
249
|
* convertSchemaSchaltfeldElemente
|
|
249
250
|
*/
|
|
250
251
|
convertSchemaSchaltfeldElemente(nsgSchaltfeld) {
|
|
251
|
-
var _a
|
|
252
|
+
var _a;
|
|
252
253
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
253
254
|
const resultingDiagramObjects = [];
|
|
254
255
|
// Es kann vorkommen, dass der Standort einer Sammelschiene bzw. einer Schaltanlage nicht eingeblendet ist.
|
|
@@ -411,7 +412,7 @@ class DLConverterI7 {
|
|
|
411
412
|
for (const nodePointEntry of nodePointMap.entries()) {
|
|
412
413
|
const key = nodePointEntry[0];
|
|
413
414
|
const value = nodePointEntry[1];
|
|
414
|
-
const cimObjectUUID = (
|
|
415
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _a !== void 0 ? _a : undefined;
|
|
415
416
|
value.identifiedObjectUUID = cimObjectUUID;
|
|
416
417
|
if (!this.alreadyExported(nsgSchaltfeld.variantennr, key)) {
|
|
417
418
|
resultingDiagramObjects.push(value);
|
|
@@ -470,7 +471,7 @@ class DLConverterI7 {
|
|
|
470
471
|
* convertSchemaTransformer2W
|
|
471
472
|
*/
|
|
472
473
|
convertSchemaTransformer2W(nsgTrafo2w) {
|
|
473
|
-
var _a
|
|
474
|
+
var _a;
|
|
474
475
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
475
476
|
const nsgStandort = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgstandort, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgTrafo2w.variantennr, id: nsgTrafo2w.nsgso }, false);
|
|
476
477
|
if (!nsgStandort)
|
|
@@ -478,7 +479,7 @@ class DLConverterI7 {
|
|
|
478
479
|
const netzTrafo2W = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.netz_trafo2w, convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo2w.trafo2w });
|
|
479
480
|
if (!netzTrafo2W)
|
|
480
481
|
return;
|
|
481
|
-
const powerTransformerUUID = (
|
|
482
|
+
const powerTransformerUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo2w.trafo2w })) !== null && _a !== void 0 ? _a : undefined;
|
|
482
483
|
let centerTransformer = [null, null];
|
|
483
484
|
let positionAnschlussanf = [null, null];
|
|
484
485
|
let positionAnschlussend = [null, null];
|
|
@@ -577,7 +578,7 @@ class DLConverterI7 {
|
|
|
577
578
|
* convertSchemaTransformer3W
|
|
578
579
|
*/
|
|
579
580
|
convertSchemaTransformer3W(nsgTrafo3w) {
|
|
580
|
-
var _a
|
|
581
|
+
var _a;
|
|
581
582
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
582
583
|
const nsgStandort = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgstandort, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgTrafo3w.variantennr, id: nsgTrafo3w.nsgso }, false);
|
|
583
584
|
if (!nsgStandort)
|
|
@@ -585,7 +586,7 @@ class DLConverterI7 {
|
|
|
585
586
|
const netzTrafo3w = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.netz_trafo3w, convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo3w.trafo3w });
|
|
586
587
|
if (!netzTrafo3w)
|
|
587
588
|
return null;
|
|
588
|
-
const powerTransformerUUID = (
|
|
589
|
+
const powerTransformerUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgTrafo3w.trafo3w })) !== null && _a !== void 0 ? _a : undefined;
|
|
589
590
|
// Der relative Punkt des Transformators ist die linke obere Ecke bezogen auf die Bounding-Box
|
|
590
591
|
const trafoDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(constants_1.NsgConstants.TRAFO3W_WIDTH / 2, constants_1.NsgConstants.TRAFO3W_HEIGHT / 2);
|
|
591
592
|
const powerTransformerDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
@@ -761,7 +762,7 @@ class DLConverterI7 {
|
|
|
761
762
|
* convertSchemaLeitung
|
|
762
763
|
*/
|
|
763
764
|
convertSchemaLeitung(nsgLeitung, splitLine = true) {
|
|
764
|
-
var _a, _b
|
|
765
|
+
var _a, _b;
|
|
765
766
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
766
767
|
let netzLeitung;
|
|
767
768
|
netzLeitung = yield this.dbObjectGraph.findObjectByKey([
|
|
@@ -791,7 +792,7 @@ class DLConverterI7 {
|
|
|
791
792
|
const nsgLtgpunkte = yield this.dbObjectGraph.findAllByAttributes(convert_graph_keys_1.i7TableNames.nsg_nsgltgpunkt, { nsgleitung: nsgLeitung.id });
|
|
792
793
|
// Manche Leitung beinhalten keine Zwischenpunkte, sondern verlaufen lediglich zwischen dem Start- und Endpunkt
|
|
793
794
|
// if (nsgLtgpunkte.length === 0) return;
|
|
794
|
-
const cimObjectUUID = (
|
|
795
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLeitung.leitung })) !== null && _a !== void 0 ? _a : undefined;
|
|
795
796
|
nsgLtgpunkte.sort((a, b) => a.pos - b.pos);
|
|
796
797
|
const diagramObject = new DiagramObject_1.DiagramObject();
|
|
797
798
|
diagramObject.name = `Leitung ${generalNetzLeitung.id}`;
|
|
@@ -887,7 +888,7 @@ class DLConverterI7 {
|
|
|
887
888
|
}
|
|
888
889
|
const segments = util_functions_1.DLUtilFunctions.splitLineIntoLineSegments(segmentPercentages, diagramObject.diagramObjectPoints.map(arg => [arg.xPosition, arg.yPosition]));
|
|
889
890
|
for (let a = 0; a < segments.length; ++a) {
|
|
890
|
-
const thisSegmentUUID = (
|
|
891
|
+
const thisSegmentUUID = (_b = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: netzLeitungsabschnitte[a].id })) !== null && _b !== void 0 ? _b : undefined;
|
|
891
892
|
const thisSegmentCimObject = this.cimModelGraph.findObjectByUUID(thisSegmentUUID);
|
|
892
893
|
const diagramObject = new DiagramObject_1.DiagramObject();
|
|
893
894
|
diagramObject.name = `Leitung ${generalNetzLeitung.id}`;
|
|
@@ -913,7 +914,7 @@ class DLConverterI7 {
|
|
|
913
914
|
if (thisSegmentCimObject) {
|
|
914
915
|
// need to get the ConnectivityNode and the Terminal, which connects the current (this) with the prev segment
|
|
915
916
|
const prevSegment = netzLeitungsabschnitte[a - 1];
|
|
916
|
-
const prevSegmentUUID = this.
|
|
917
|
+
const prevSegmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: prevSegment.id });
|
|
917
918
|
const prevSegmentCimObject = this.cimModelGraph.findObjectByUUID(prevSegmentUUID);
|
|
918
919
|
let connectivityNodeUUIDThisToPrev;
|
|
919
920
|
let terminalUUIDThisToPrevConnectivityNode;
|
|
@@ -957,7 +958,7 @@ class DLConverterI7 {
|
|
|
957
958
|
if (thisSegmentCimObject) {
|
|
958
959
|
// need to get the ConnectivityNode and the Terminal, which connects the current (this) with the next segment
|
|
959
960
|
const nextSegment = netzLeitungsabschnitte[a + 1];
|
|
960
|
-
const nextSegmentUUID = this.
|
|
961
|
+
const nextSegmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nextSegment.id });
|
|
961
962
|
const nextSegmentCimObject = this.cimModelGraph.findObjectByUUID(nextSegmentUUID);
|
|
962
963
|
let connectivityNodeUUIDThisToNext;
|
|
963
964
|
let terminalUUIDThisToNextConnectivityNode;
|
|
@@ -1042,7 +1043,7 @@ class DLConverterI7 {
|
|
|
1042
1043
|
* convertSchemaQuerzweig
|
|
1043
1044
|
*/
|
|
1044
1045
|
convertSchemaQuerzweig(nsgQuerzweig) {
|
|
1045
|
-
var _a
|
|
1046
|
+
var _a;
|
|
1046
1047
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
1047
1048
|
const resultingDiagramObjects = [];
|
|
1048
1049
|
const typedResult = this.dbObjectGraph.findTypedFirstByKey(convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, {
|
|
@@ -1077,7 +1078,7 @@ class DLConverterI7 {
|
|
|
1077
1078
|
else {
|
|
1078
1079
|
return null;
|
|
1079
1080
|
}
|
|
1080
|
-
const cimObjectUUID = (
|
|
1081
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgQuerzweig.querzweig })) !== null && _a !== void 0 ? _a : undefined;
|
|
1081
1082
|
const querzweigDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
1082
1083
|
xPosition: xPosition,
|
|
1083
1084
|
yPosition: yPosition,
|
|
@@ -1112,12 +1113,12 @@ class DLConverterI7 {
|
|
|
1112
1113
|
* convertNsgLeitungStreckenlast
|
|
1113
1114
|
*/
|
|
1114
1115
|
convertNsgLeitungStreckenlast(nsgLeitung, netzStreckenlast, splitLine = true) {
|
|
1115
|
-
var _a, _b
|
|
1116
|
+
var _a, _b;
|
|
1116
1117
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
1117
1118
|
const nsgLtgpunkte = yield this.dbObjectGraph.findAllByAttributes(convert_graph_keys_1.i7TableNames.nsg_nsgltgpunkt, { nsgleitung: nsgLeitung.id });
|
|
1118
1119
|
// Manche Leitung beinhalten keine Zwischenpunkte, sondern verlaufen lediglich zwischen dem Start- und Endpunkt
|
|
1119
1120
|
// if (nsgLtgpunkte.length === 0) return;
|
|
1120
|
-
const cimObjectUUID = (
|
|
1121
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLeitung.leitung })) !== null && _a !== void 0 ? _a : undefined;
|
|
1121
1122
|
nsgLtgpunkte.sort((a, b) => a.pos - b.pos);
|
|
1122
1123
|
const diagramObject = new DiagramObject_1.DiagramObject();
|
|
1123
1124
|
diagramObject.name = `Streckenlast ${netzStreckenlast.id}`;
|
|
@@ -1213,7 +1214,7 @@ class DLConverterI7 {
|
|
|
1213
1214
|
}
|
|
1214
1215
|
const segments = util_functions_1.DLUtilFunctions.splitLineIntoLineSegments(segmentPercentages, diagramObject.diagramObjectPoints.map(arg => [arg.xPosition, arg.yPosition]));
|
|
1215
1216
|
for (let a = 0; a < segments.length; ++a) {
|
|
1216
|
-
const thisSegmentUUID = (
|
|
1217
|
+
const thisSegmentUUID = (_b = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: netzLeitungsabschnitte[a].id })) !== null && _b !== void 0 ? _b : undefined;
|
|
1217
1218
|
const thisSegmentCimObject = this.cimModelGraph.findObjectByUUID(thisSegmentUUID);
|
|
1218
1219
|
const diagramObject = new DiagramObject_1.DiagramObject();
|
|
1219
1220
|
diagramObject.name = `Leitung ${netzStreckenlast.id}`;
|
|
@@ -1239,7 +1240,7 @@ class DLConverterI7 {
|
|
|
1239
1240
|
if (thisSegmentCimObject) {
|
|
1240
1241
|
// need to get the ConnectivityNode and the Terminal, which connects the current (this) with the prev segment
|
|
1241
1242
|
const prevSegment = netzLeitungsabschnitte[a - 1];
|
|
1242
|
-
const prevSegmentUUID = this.
|
|
1243
|
+
const prevSegmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: prevSegment.id });
|
|
1243
1244
|
const prevSegmentCimObject = this.cimModelGraph.findObjectByUUID(prevSegmentUUID);
|
|
1244
1245
|
let connectivityNodeUUIDThisToPrev;
|
|
1245
1246
|
let terminalUUIDThisToPrevConnectivityNode;
|
|
@@ -1283,7 +1284,7 @@ class DLConverterI7 {
|
|
|
1283
1284
|
if (thisSegmentCimObject) {
|
|
1284
1285
|
// need to get the ConnectivityNode and the Terminal, which connects the current (this) with the next segment
|
|
1285
1286
|
const nextSegment = netzLeitungsabschnitte[a + 1];
|
|
1286
|
-
const nextSegmentUUID = this.
|
|
1287
|
+
const nextSegmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nextSegment.id });
|
|
1287
1288
|
const nextSegmentCimObject = this.cimModelGraph.findObjectByUUID(nextSegmentUUID);
|
|
1288
1289
|
let connectivityNodeUUIDThisToNext;
|
|
1289
1290
|
let terminalUUIDThisToNextConnectivityNode;
|
|
@@ -1381,7 +1382,7 @@ class DLConverterI7 {
|
|
|
1381
1382
|
* convertSchemaQuerzweigqcont
|
|
1382
1383
|
*/
|
|
1383
1384
|
convertSchemaQuerzweigqzcont(nsgQuerzweigqzcont) {
|
|
1384
|
-
var _a
|
|
1385
|
+
var _a;
|
|
1385
1386
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
1386
1387
|
const resultingDiagramObjects = [];
|
|
1387
1388
|
const typedResult = this.dbObjectGraph.findTypedFirstByKey(convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, {
|
|
@@ -1418,7 +1419,7 @@ class DLConverterI7 {
|
|
|
1418
1419
|
id: nsgQuerzweigqzContelem.querzweig
|
|
1419
1420
|
});
|
|
1420
1421
|
const netzQuerzweig = querzweigWrapperObject.object;
|
|
1421
|
-
const cimObjectUUID = (
|
|
1422
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgQuerzweigqzContelem.querzweig })) !== null && _a !== void 0 ? _a : undefined;
|
|
1422
1423
|
const querzweigDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
1423
1424
|
xPosition: xPosition,
|
|
1424
1425
|
yPosition: yPosition,
|
|
@@ -1452,7 +1453,7 @@ class DLConverterI7 {
|
|
|
1452
1453
|
* convertSchemaNsgLKupplungRss
|
|
1453
1454
|
*/
|
|
1454
1455
|
convertSchemaNsgLKupplungRss(nsgLKupplungRss) {
|
|
1455
|
-
var _a
|
|
1456
|
+
var _a;
|
|
1456
1457
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
1457
1458
|
const resultingDiagramObjects = [];
|
|
1458
1459
|
const netzLKupplung = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.netz_lkupplung, convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLKupplungRss.lkupplung });
|
|
@@ -1812,7 +1813,7 @@ class DLConverterI7 {
|
|
|
1812
1813
|
for (const nodePointEntry of nodePointMap.entries()) {
|
|
1813
1814
|
const key = nodePointEntry[0];
|
|
1814
1815
|
const value = nodePointEntry[1];
|
|
1815
|
-
const cimObjectUUID = (
|
|
1816
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _a !== void 0 ? _a : undefined;
|
|
1816
1817
|
value.identifiedObjectUUID = cimObjectUUID;
|
|
1817
1818
|
if (!this.alreadyExported(nsgLKupplungRss.variantennr, key)) {
|
|
1818
1819
|
resultingDiagramObjects.push(value);
|
|
@@ -1893,7 +1894,7 @@ class DLConverterI7 {
|
|
|
1893
1894
|
* convertSchemaKpfeld
|
|
1894
1895
|
*/
|
|
1895
1896
|
convertSchemaKpfeld(nsgKpfeld) {
|
|
1896
|
-
var _a
|
|
1897
|
+
var _a;
|
|
1897
1898
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
1898
1899
|
const resultingDiagramObjects = [];
|
|
1899
1900
|
const nsgSaabschnitt = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgsaabschnitt, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgKpfeld.variantennr, id: nsgKpfeld.nsgsaa }, false);
|
|
@@ -2219,7 +2220,7 @@ class DLConverterI7 {
|
|
|
2219
2220
|
for (const nodePointEntry of nodePointMap.entries()) {
|
|
2220
2221
|
const key = nodePointEntry[0];
|
|
2221
2222
|
const value = nodePointEntry[1];
|
|
2222
|
-
const cimObjectUUID = (
|
|
2223
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _a !== void 0 ? _a : undefined;
|
|
2223
2224
|
value.identifiedObjectUUID = cimObjectUUID;
|
|
2224
2225
|
if (!this.alreadyExported(nsgKpfeld.variantennr, key)) {
|
|
2225
2226
|
resultingDiagramObjects.push(value);
|
|
@@ -2233,7 +2234,7 @@ class DLConverterI7 {
|
|
|
2233
2234
|
* convertSchemaLKupplung
|
|
2234
2235
|
*/
|
|
2235
2236
|
convertSchemaLKupplung(nsgLKupplung, netzLKupplung) {
|
|
2236
|
-
var _a
|
|
2237
|
+
var _a;
|
|
2237
2238
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
2238
2239
|
const resultingDiagramObjects = [];
|
|
2239
2240
|
const nsgSaabschnitt = yield this.dbObjectGraph.findObjectByKey(convert_graph_keys_1.i7TableNames.nsg_nsgsaabschnitt, convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, { variantennr: nsgLKupplung.variantennr, id: nsgLKupplung.nsgsaa }, false);
|
|
@@ -2639,7 +2640,7 @@ class DLConverterI7 {
|
|
|
2639
2640
|
for (const nodePointEntry of nodePointMap.entries()) {
|
|
2640
2641
|
const key = nodePointEntry[0];
|
|
2641
2642
|
const value = nodePointEntry[1];
|
|
2642
|
-
const cimObjectUUID = (
|
|
2643
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: key })) !== null && _a !== void 0 ? _a : undefined;
|
|
2643
2644
|
value.identifiedObjectUUID = cimObjectUUID;
|
|
2644
2645
|
if (!this.alreadyExported(nsgLKupplung.variantennr, key)) {
|
|
2645
2646
|
resultingDiagramObjects.push(value);
|
|
@@ -2653,7 +2654,7 @@ class DLConverterI7 {
|
|
|
2653
2654
|
* convertSchemaStpschiene
|
|
2654
2655
|
*/
|
|
2655
2656
|
convertSchemaLKondensator(nsgLKondensator) {
|
|
2656
|
-
var _a
|
|
2657
|
+
var _a;
|
|
2657
2658
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
2658
2659
|
const resultingDiagramObjects = [];
|
|
2659
2660
|
const leftUpperCornerOfNsgLKondensator = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsglkondensator, nsgLKondensator);
|
|
@@ -2697,7 +2698,7 @@ class DLConverterI7 {
|
|
|
2697
2698
|
endPos[1] += 48;
|
|
2698
2699
|
break;
|
|
2699
2700
|
}
|
|
2700
|
-
const cimObjectUUID = (
|
|
2701
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgLKondensator.lkondensator })) !== null && _a !== void 0 ? _a : undefined;
|
|
2701
2702
|
const doLKondensator = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
2702
2703
|
xPosition: pos[0],
|
|
2703
2704
|
yPosition: pos[1],
|
|
@@ -2762,7 +2763,7 @@ class DLConverterI7 {
|
|
|
2762
2763
|
* convertSchemaStpschiene
|
|
2763
2764
|
*/
|
|
2764
2765
|
convertSchemaStpschiene(nsgStpschiene) {
|
|
2765
|
-
var _a, _b
|
|
2766
|
+
var _a, _b;
|
|
2766
2767
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
2767
2768
|
const leftUpperCornerOfNsgStpschiene = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsgstpschiene, nsgStpschiene);
|
|
2768
2769
|
const length = nsgStpschiene.laenge;
|
|
@@ -2786,7 +2787,7 @@ class DLConverterI7 {
|
|
|
2786
2787
|
topLeft.sequenceNumber = 1;
|
|
2787
2788
|
bottomRight.sequenceNumber = 2;
|
|
2788
2789
|
points.push(topLeft, bottomRight);
|
|
2789
|
-
const cimObjectUUID = (
|
|
2790
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgStpschiene.stpschiene })) !== null && _a !== void 0 ? _a : undefined;
|
|
2790
2791
|
const connectivityNode = this.cimModelGraph.findObjectByUUID(cimObjectUUID);
|
|
2791
2792
|
let junction = null;
|
|
2792
2793
|
let junctionTerminal = null;
|
|
@@ -2799,7 +2800,7 @@ class DLConverterI7 {
|
|
|
2799
2800
|
}
|
|
2800
2801
|
}
|
|
2801
2802
|
}
|
|
2802
|
-
if (junction && junctionTerminal && !((
|
|
2803
|
+
if (junction && junctionTerminal && !((_b = this.config) === null || _b === void 0 ? void 0 : _b.busbarSectionAsConnectivityNode)) {
|
|
2803
2804
|
// compute the position for the ConnectivityNode (the center of the BusbarSection)
|
|
2804
2805
|
const centerPosition = [
|
|
2805
2806
|
(topLeft.xPosition + bottomRight.xPosition) / 2,
|
|
@@ -2832,7 +2833,7 @@ class DLConverterI7 {
|
|
|
2832
2833
|
* convertSchemaStpknoten
|
|
2833
2834
|
*/
|
|
2834
2835
|
convertSchemaStpknoten(nsgStpknoten) {
|
|
2835
|
-
var _a
|
|
2836
|
+
var _a;
|
|
2836
2837
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
2837
2838
|
const resultingDiagramObjects = [];
|
|
2838
2839
|
let leftUpperCornerOfNsgStpknoten = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsgstpknoten, nsgStpknoten);
|
|
@@ -2849,7 +2850,7 @@ class DLConverterI7 {
|
|
|
2849
2850
|
coords[1] += 8;
|
|
2850
2851
|
break;
|
|
2851
2852
|
}
|
|
2852
|
-
const cimObjectUUID = (
|
|
2853
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgStpknoten.knoten })) !== null && _a !== void 0 ? _a : undefined;
|
|
2853
2854
|
const doStpknoten = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
2854
2855
|
xPosition: coords[0],
|
|
2855
2856
|
yPosition: coords[1],
|
|
@@ -2874,7 +2875,7 @@ class DLConverterI7 {
|
|
|
2874
2875
|
* convertSchemaStpimpedanz
|
|
2875
2876
|
*/
|
|
2876
2877
|
convertSchemaStpimpedanz(nsgStpimpedanz) {
|
|
2877
|
-
var _a
|
|
2878
|
+
var _a;
|
|
2878
2879
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
2879
2880
|
const resultingDiagramObjects = [];
|
|
2880
2881
|
let leftUpperCornerOfNsgStpimpedanz = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsgstpimpedanz, nsgStpimpedanz);
|
|
@@ -2894,7 +2895,7 @@ class DLConverterI7 {
|
|
|
2894
2895
|
coords[1] += (width / 2);
|
|
2895
2896
|
break;
|
|
2896
2897
|
}
|
|
2897
|
-
const cimObjectUUID = (
|
|
2898
|
+
const cimObjectUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: nsgStpimpedanz.kdrossel })) !== null && _a !== void 0 ? _a : undefined;
|
|
2898
2899
|
const doStpknoten = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
2899
2900
|
xPosition: coords[0],
|
|
2900
2901
|
yPosition: coords[1],
|
|
@@ -2910,7 +2911,7 @@ class DLConverterI7 {
|
|
|
2910
2911
|
* convertSchemaStpschaltfeld
|
|
2911
2912
|
*/
|
|
2912
2913
|
convertSchemaStpschaltfeldElemente(nsgStpschaltfeld) {
|
|
2913
|
-
var _a, _b
|
|
2914
|
+
var _a, _b;
|
|
2914
2915
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
2915
2916
|
const resultingDiagramObjects = [];
|
|
2916
2917
|
const leftUpperCornerOfNsgStpSchaltfeld = yield this.getLeftUpperCornerOf(convert_graph_keys_1.i7TableNames.nsg_nsgstpschaltfeld, nsgStpschaltfeld);
|
|
@@ -2968,7 +2969,7 @@ class DLConverterI7 {
|
|
|
2968
2969
|
coordsConnectivityNodeBusbarSection[1] += 8;
|
|
2969
2970
|
break;
|
|
2970
2971
|
}
|
|
2971
|
-
const equipmentUUID = (
|
|
2972
|
+
const equipmentUUID = (_a = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: schaltelement1pelem.id })) !== null && _a !== void 0 ? _a : undefined;
|
|
2972
2973
|
const doEquipment = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
2973
2974
|
xPosition: coordsEquipment[0],
|
|
2974
2975
|
yPosition: coordsEquipment[1],
|
|
@@ -2976,7 +2977,7 @@ class DLConverterI7 {
|
|
|
2976
2977
|
diagramObjectName: `NsgStpschaltfeld-Node ${schaltelement1pelem.id}`,
|
|
2977
2978
|
identifiedObjectUUID: equipmentUUID
|
|
2978
2979
|
});
|
|
2979
|
-
const connectivityNodeBayEndUUID = (
|
|
2980
|
+
const connectivityNodeBayEndUUID = (_b = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: schaltelement1pelem.eknoten })) !== null && _b !== void 0 ? _b : undefined;
|
|
2980
2981
|
const doConnectivityNodeBayEnd = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint2({
|
|
2981
2982
|
xPosition: coordsConnectivityNodeBayEnd[0],
|
|
2982
2983
|
yPosition: coordsConnectivityNodeBayEnd[1],
|
|
@@ -3006,7 +3007,7 @@ class DLConverterI7 {
|
|
|
3006
3007
|
// async convertSchemaStpTerminals(nsgStpknoten: NsgStpknoten): Promise<DiagramObject[]> {
|
|
3007
3008
|
// const resultingDiagramObjects: DiagramObject[] = [];
|
|
3008
3009
|
//
|
|
3009
|
-
// const cimObjectUUID = this.
|
|
3010
|
+
// const cimObjectUUID = this.getCimObjectIdFromDbKey(
|
|
3010
3011
|
// i7SchemaKeyNames.IdOnlyKey, { id: nsgStpknoten.knoten }
|
|
3011
3012
|
// ) ?? undefined;
|
|
3012
3013
|
//
|
|
@@ -3019,7 +3020,7 @@ class DLConverterI7 {
|
|
|
3019
3020
|
//
|
|
3020
3021
|
// const ceUUID = terminal.getConductingEquipmentUUID();
|
|
3021
3022
|
//
|
|
3022
|
-
// const ceDbKeys = this.
|
|
3023
|
+
// const ceDbKeys = this.getDbKeyDbFromCimObjectId(ceUUID);
|
|
3023
3024
|
//
|
|
3024
3025
|
// if (ceDbKeys.VariantenNrIdKey) {
|
|
3025
3026
|
// const ceDbKey = ceDbKeys.VariantenNrIdKey;
|
|
@@ -3546,8 +3547,8 @@ class DLConverterI7 {
|
|
|
3546
3547
|
if (DLConverterI7.testmode) {
|
|
3547
3548
|
return common_utils_1.CommonUtils.generateUUID();
|
|
3548
3549
|
}
|
|
3549
|
-
const connectivityNodeUUID = this.
|
|
3550
|
-
const conductingEquipmentUUID = this.
|
|
3550
|
+
const connectivityNodeUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: connectivityNodeI7ID });
|
|
3551
|
+
const conductingEquipmentUUID = this.getCimObjectIdFromDbKey(convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey, { id: conductingEquipmentI7ID });
|
|
3551
3552
|
if (!connectivityNodeUUID || !conductingEquipmentUUID) {
|
|
3552
3553
|
return null;
|
|
3553
3554
|
}
|
|
@@ -3636,6 +3637,17 @@ class DLConverterI7 {
|
|
|
3636
3637
|
}
|
|
3637
3638
|
return false;
|
|
3638
3639
|
}
|
|
3640
|
+
linkIntegralId2UUIDMap(integralID2UUID) {
|
|
3641
|
+
this.integralID2UUID = integralID2UUID;
|
|
3642
|
+
}
|
|
3643
|
+
getCimObjectIdFromDbKey(typeOfKey, dbKey) {
|
|
3644
|
+
if (typeOfKey === convert_graph_keys_1.i7SchemaKeyNames.IdOnlyKey) {
|
|
3645
|
+
return this.integralID2UUID.get(dbKey.id);
|
|
3646
|
+
}
|
|
3647
|
+
else {
|
|
3648
|
+
throw Error('Optimierung ging nach hinten los!');
|
|
3649
|
+
}
|
|
3650
|
+
}
|
|
3639
3651
|
}
|
|
3640
3652
|
exports.DLConverterI7 = DLConverterI7;
|
|
3641
3653
|
DLConverterI7.testmode = false;
|