@enervance/insight-cim-model 0.0.172 → 0.0.173
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 +37 -24
- package/dist/converter/integral7/converter.integral7.js.map +1 -1
- package/dist/converter/integral7/dl-convert/dl-converter-i7.d.ts +1 -7
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js +42 -36
- 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 +10 -17
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js +58 -27
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js.map +1 -1
- package/dist/converter/integral7/dl-convert/dl-graphs/db-object-graph.d.ts +1 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/db-object-graph.js +3 -0
- package/dist/converter/integral7/dl-convert/dl-graphs/db-object-graph.js.map +1 -1
- package/dist/converter/integral7/dl-convert/executor.js +22 -34
- package/dist/converter/integral7/dl-convert/executor.js.map +1 -1
- package/dist/converter/integral7/interface-i7/export-frame-i7.js +1 -0
- package/dist/converter/integral7/interface-i7/export-frame-i7.js.map +1 -1
- package/dist/converter/integral7/model/interfaces.d.ts +1 -0
- package/dist/converter/integral7/model/interfaces.js.map +1 -1
- package/dist/model/dc/DCLine.js +17 -17
- package/dist/model/dc/DCLineSegment.js +25 -25
- package/dist/model/diagram/DiagramObject.js +0 -3
- package/dist/model/diagram/DiagramObject.js.map +1 -1
- package/dist/model/loadmodel/ConformLoadGroup.js +22 -22
- package/dist/model/loadmodel/LoadArea.js +21 -21
- package/dist/model/loadmodel/SubLoadArea.js +22 -22
- package/dist/model-container/enum/EVModelTypeKind.d.ts +2 -1
- package/dist/model-container/enum/EVModelTypeKind.js +1 -0
- package/dist/model-container/enum/EVModelTypeKind.js.map +1 -1
- package/dist/model-container/model/EVModelsContainer.d.ts +1 -0
- package/dist/model-container/model/EVModelsContainer.js +7 -0
- package/dist/model-container/model/EVModelsContainer.js.map +1 -1
- package/dist/model-container/model/ModelContainer.js +3 -0
- package/dist/model-container/model/ModelContainer.js.map +1 -1
- package/package.json +1 -1
|
@@ -18,8 +18,7 @@ export declare class DLConverterI7 {
|
|
|
18
18
|
private dbObjectGraph;
|
|
19
19
|
private dbObjectKeyCimModelUuidGraph;
|
|
20
20
|
private cimModelGraph;
|
|
21
|
-
|
|
22
|
-
private trafowicklungIntegralId2Uuid;
|
|
21
|
+
exportedTerminalUUIDs: Set<string>;
|
|
23
22
|
exportedDiagramObjectsGraph: {
|
|
24
23
|
[variantenNr: number | string]: {
|
|
25
24
|
[netzId: number | string]: DiagramObject;
|
|
@@ -31,7 +30,6 @@ export declare class DLConverterI7 {
|
|
|
31
30
|
setDbObjectGraph(graph: DbObjectGraph<I7TableSchemas, typeof i7SchemaKeyDefinitions>): void;
|
|
32
31
|
setCimModelGraph(graph: CimModelGraph): void;
|
|
33
32
|
setDbObjectKeyCimModelUuidGraph(graph: DbObjectKey2CimModelUUIDGraph<typeof i7SchemaKeyDefinitions>): void;
|
|
34
|
-
setTrafowicklungIntegralId2Uuid(trafowicklungIntegralId2Uuid: Map<number, string>): void;
|
|
35
33
|
addCimObject<K extends typeof i7SchemaKeyDefinitions, KN extends keyof typeof i7SchemaKeyDefinitions & string>(uuid: string, object: any, typeOfKey?: KN, dbKey?: K[KN]): void;
|
|
36
34
|
/**
|
|
37
35
|
* convertNsgVariante
|
|
@@ -131,10 +129,6 @@ export declare class DLConverterI7 {
|
|
|
131
129
|
* convertSchemaStpschaltfeld
|
|
132
130
|
*/
|
|
133
131
|
convertSchemaStpschaltfeldElemente(nsgStpschaltfeld: NsgStpschaltfeld): Promise<DiagramObject[]>;
|
|
134
|
-
/**
|
|
135
|
-
* convertSchemaStp*-Terminals
|
|
136
|
-
*/
|
|
137
|
-
convertSchemaStpTerminals(nsgStpknoten: NsgStpknoten): Promise<DiagramObject[]>;
|
|
138
132
|
getLeftUpperCornerOfUnspecified(variantennr: number, id: number): Promise<number[]>;
|
|
139
133
|
getLeftUpperCornerOf(i7ObjectType: string, object: any, variantennr?: number): Promise<number[]>;
|
|
140
134
|
getLeftUpperCornerOfLKupplungRssElement(nsgLKupplungRss: NsgLKupplungRss, cornerOf: {
|
|
@@ -21,6 +21,7 @@ const Junction_1 = require("../../../model/wires/Junction.js");
|
|
|
21
21
|
const cim_class_names_1 = require("../../../constants/cim-class-names.js");
|
|
22
22
|
class DLConverterI7 {
|
|
23
23
|
constructor(configUuid, logger, config) {
|
|
24
|
+
// private exportedBusbarSectionConnectivityNodeUuidToDiagramObject: Map<string, DiagramObject>;
|
|
24
25
|
this.exportedDiagramObjectsGraph = {};
|
|
25
26
|
this.configUuid = configUuid;
|
|
26
27
|
this.logger = logger;
|
|
@@ -52,13 +53,10 @@ class DLConverterI7 {
|
|
|
52
53
|
setDbObjectKeyCimModelUuidGraph(graph) {
|
|
53
54
|
this.dbObjectKeyCimModelUuidGraph = graph;
|
|
54
55
|
}
|
|
55
|
-
setTrafowicklungIntegralId2Uuid(trafowicklungIntegralId2Uuid) {
|
|
56
|
-
this.trafowicklungIntegralId2Uuid = trafowicklungIntegralId2Uuid;
|
|
57
|
-
}
|
|
58
56
|
addCimObject(uuid, object, typeOfKey, dbKey) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
this.cimModelGraph.addUnspecifiedObject(uuid, object);
|
|
57
|
+
// todo remove call from test
|
|
58
|
+
// if (typeOfKey !== undefined && dbKey !== undefined) this.dbObjectKeyCimModelUuidGraph.addRelation(typeOfKey, dbKey, uuid);
|
|
59
|
+
// this.cimModelGraph.addUnspecifiedObject(uuid, object);
|
|
62
60
|
}
|
|
63
61
|
/**
|
|
64
62
|
* convertNsgVariante
|
|
@@ -3001,36 +2999,44 @@ class DLConverterI7 {
|
|
|
3001
2999
|
return resultingDiagramObjects;
|
|
3002
3000
|
});
|
|
3003
3001
|
}
|
|
3004
|
-
/**
|
|
3005
|
-
|
|
3006
|
-
|
|
3007
|
-
convertSchemaStpTerminals(nsgStpknoten) {
|
|
3008
|
-
|
|
3009
|
-
|
|
3010
|
-
|
|
3011
|
-
|
|
3012
|
-
|
|
3013
|
-
|
|
3014
|
-
|
|
3015
|
-
|
|
3016
|
-
|
|
3017
|
-
|
|
3018
|
-
|
|
3019
|
-
|
|
3020
|
-
|
|
3021
|
-
|
|
3022
|
-
|
|
3023
|
-
|
|
3024
|
-
|
|
3025
|
-
|
|
3026
|
-
|
|
3027
|
-
|
|
3028
|
-
|
|
3029
|
-
|
|
3030
|
-
|
|
3031
|
-
|
|
3032
|
-
|
|
3033
|
-
}
|
|
3002
|
+
// /**
|
|
3003
|
+
// * convertSchemaStp*-Terminals
|
|
3004
|
+
// */
|
|
3005
|
+
// async convertSchemaStpTerminals(nsgStpknoten: NsgStpknoten): Promise<DiagramObject[]> {
|
|
3006
|
+
// const resultingDiagramObjects: DiagramObject[] = [];
|
|
3007
|
+
//
|
|
3008
|
+
// const cimObjectUUID = this.dbObjectKeyCimModelUuidGraph?.getCimObjectIdFromDbKey(
|
|
3009
|
+
// i7SchemaKeyNames.IdOnlyKey, { id: nsgStpknoten.knoten }
|
|
3010
|
+
// ) ?? undefined;
|
|
3011
|
+
//
|
|
3012
|
+
// const doConnectivityNode = this.exportedDiagramObjectsGraph[nsgStpknoten.variantennr][nsgStpknoten.id];
|
|
3013
|
+
// const connectivityNode: ConnectivityNode = this.cimModelGraph.findObjectByUUID(doConnectivityNode.getIdentifiedObjectUUID());
|
|
3014
|
+
//
|
|
3015
|
+
// if (connectivityNode !== undefined) {
|
|
3016
|
+
// for (const terminal of connectivityNode.terminals.values()) {
|
|
3017
|
+
// if (this.exportedTerminalUUIDs.has(terminal.getUUID())) continue;
|
|
3018
|
+
//
|
|
3019
|
+
// const ceUUID = terminal.getConductingEquipmentUUID();
|
|
3020
|
+
//
|
|
3021
|
+
// const ceDbKeys = this.dbObjectKeyCimModelUuidGraph.getDbKeyDbFromCimObjectId(ceUUID);
|
|
3022
|
+
//
|
|
3023
|
+
// if (ceDbKeys.VariantenNrIdKey) {
|
|
3024
|
+
// const ceDbKey = ceDbKeys.VariantenNrIdKey;
|
|
3025
|
+
// const doConductingEquipment = this.exportedDiagramObjectsGraph[ceDbKey.variantennr][ceDbKey.id];
|
|
3026
|
+
//
|
|
3027
|
+
//
|
|
3028
|
+
// } else if (ceDbKeys.IdOnlyKey) {
|
|
3029
|
+
//
|
|
3030
|
+
// }
|
|
3031
|
+
// }
|
|
3032
|
+
//
|
|
3033
|
+
// } else {
|
|
3034
|
+
// console.log(cimObjectUUID)
|
|
3035
|
+
// }
|
|
3036
|
+
//
|
|
3037
|
+
//
|
|
3038
|
+
// return resultingDiagramObjects;
|
|
3039
|
+
// }
|
|
3034
3040
|
/* ---------- ---------- ---------- ---------- ---------- */
|
|
3035
3041
|
//
|
|
3036
3042
|
// utility functions
|