@enervance/insight-cim-model 0.0.164 → 0.0.166

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 (87) 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/dl-convert/dl-converter-i7.d.ts +1 -0
  5. package/dist/converter/integral7/dl-convert/dl-converter-i7.js +30 -18
  6. package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
  7. package/dist/converter/integral7/model/dl-utils/util-functions.d.ts +2 -0
  8. package/dist/converter/integral7/model/dl-utils/util-functions.js +19 -0
  9. package/dist/converter/integral7/model/dl-utils/util-functions.js.map +1 -1
  10. package/dist/etl/etl-dppower/etl-dppower.d.ts +15 -0
  11. package/dist/etl/etl-dppower/etl-dppower.js +215 -0
  12. package/dist/etl/etl-dppower/etl-dppower.js.map +1 -0
  13. package/dist/etl/etl-neplan/etl-neplan-geo.js +2 -2
  14. package/dist/etl/etl-neplan/etl-neplan-geo.js.map +1 -1
  15. package/dist/etl/etl-neplan/etl-neplan.js +8 -0
  16. package/dist/etl/etl-neplan/etl-neplan.js.map +1 -1
  17. package/dist/etl/etl-neplan/neplan-contingency-analysis.js +4 -1
  18. package/dist/etl/etl-neplan/neplan-contingency-analysis.js.map +1 -1
  19. package/dist/index.d.ts +4 -0
  20. package/dist/index.js +12 -5
  21. package/dist/index.js.map +1 -1
  22. package/dist/interfaces/model/wires/IRegulatingCondEq.d.ts +3 -0
  23. package/dist/model/assetinfo/CableInfo.d.ts +7 -0
  24. package/dist/model/assetinfo/CableInfo.js +49 -0
  25. package/dist/model/assetinfo/CableInfo.js.map +1 -1
  26. package/dist/model/assetinfo/OverheadWireInfo.d.ts +7 -0
  27. package/dist/model/assetinfo/OverheadWireInfo.js +49 -0
  28. package/dist/model/assetinfo/OverheadWireInfo.js.map +1 -1
  29. package/dist/model/assets/Facility.js +17 -3
  30. package/dist/model/assets/Facility.js.map +1 -1
  31. package/dist/model/assets/LifecycleDate.d.ts +1 -0
  32. package/dist/model/assets/LifecycleDate.js +3 -0
  33. package/dist/model/assets/LifecycleDate.js.map +1 -1
  34. package/dist/model/common/Location.js +1 -1
  35. package/dist/model/common/Location.js.map +1 -1
  36. package/dist/model/core/ACDCTerminal.js +2 -1
  37. package/dist/model/core/ACDCTerminal.js.map +1 -1
  38. package/dist/model/core/ConnectivityNode.d.ts +3 -0
  39. package/dist/model/core/ConnectivityNode.js +6 -0
  40. package/dist/model/core/ConnectivityNode.js.map +1 -1
  41. package/dist/model/core/Feeder.js +1 -1
  42. package/dist/model/core/Feeder.js.map +1 -1
  43. package/dist/model/core/Substation.js +7 -7
  44. package/dist/model/core/Substation.js.map +1 -1
  45. package/dist/model/dc/DCLine.js +17 -17
  46. package/dist/model/dc/DCLineSegment.js +25 -25
  47. package/dist/model/equivalents/EquivalentInjection.d.ts +11 -0
  48. package/dist/model/equivalents/EquivalentInjection.js +117 -0
  49. package/dist/model/equivalents/EquivalentInjection.js.map +1 -1
  50. package/dist/model/extensions/enervance/assets/EVWireObject.js +7 -1
  51. package/dist/model/extensions/enervance/assets/EVWireObject.js.map +1 -1
  52. package/dist/model/loadmodel/ConformLoadGroup.js +22 -22
  53. package/dist/model/loadmodel/LoadArea.js +21 -21
  54. package/dist/model/loadmodel/SubLoadArea.js +22 -22
  55. package/dist/model/topology/TopologicalNode.d.ts +3 -0
  56. package/dist/model/topology/TopologicalNode.js +4 -0
  57. package/dist/model/topology/TopologicalNode.js.map +1 -1
  58. package/dist/model/wires/ACLineSegment.d.ts +3 -0
  59. package/dist/model/wires/ACLineSegment.js +7 -1
  60. package/dist/model/wires/ACLineSegment.js.map +1 -1
  61. package/dist/model/wires/ExternalNetworkInjection.js.map +1 -1
  62. package/dist/model/wires/PowerTransformer.js +2 -0
  63. package/dist/model/wires/PowerTransformer.js.map +1 -1
  64. package/dist/model/wires/PowerTransformerEnd.js +1 -0
  65. package/dist/model/wires/PowerTransformerEnd.js.map +1 -1
  66. package/dist/model/wires/RatioTapChanger.js +1 -1
  67. package/dist/model-container/enum/EVSourceSystemKind.d.ts +1 -0
  68. package/dist/model-container/enum/EVSourceSystemKind.js +1 -0
  69. package/dist/model-container/enum/EVSourceSystemKind.js.map +1 -1
  70. package/dist/util/util-test.d.ts +1 -0
  71. package/dist/util/util-test.js +24 -1
  72. package/dist/util/util-test.js.map +1 -1
  73. package/dist/utils2/cim.model.utils.d.ts +3 -0
  74. package/dist/utils2/cim.model.utils.js +38 -0
  75. package/dist/utils2/cim.model.utils.js.map +1 -1
  76. package/dist/utils2/common.utils.d.ts +1 -0
  77. package/dist/utils2/common.utils.js +3 -0
  78. package/dist/utils2/common.utils.js.map +1 -1
  79. package/dist/utils2/fuseki.utils.d.ts +1 -0
  80. package/dist/utils2/fuseki.utils.js +18 -1
  81. package/dist/utils2/fuseki.utils.js.map +1 -1
  82. package/dist/utils2/import.utils.d.ts +2 -1
  83. package/dist/utils2/import.utils.js +9 -3
  84. package/dist/utils2/import.utils.js.map +1 -1
  85. package/dist/utils2/model.modification.utils.js +3 -1
  86. package/dist/utils2/model.modification.utils.js.map +1 -1
  87. package/package.json +1 -1
@@ -107,6 +107,8 @@ export declare class ClassNames {
107
107
  static readonly WNModelContainer = "WNModelContainer";
108
108
  static readonly AMPRIONModelContainer = "AMPRIONModelContainer";
109
109
  static readonly INTEGRALModelContainer = "INTEGRALModelContainer";
110
+ static readonly OverheadWireInfo = "OverheadWireInfo";
111
+ static readonly CableInfo = "CableInfo";
110
112
  static readonly AMPRIONOverheadWireInfo = "AMPRIONOverheadWireInfo";
111
113
  static readonly AMPRIONCableWireInfo = "AMPRIONCableWireInfo";
112
114
  static readonly Model = "Model";
@@ -135,6 +135,8 @@ ClassNames.WNModelContainer = "WNModelContainer";
135
135
  ClassNames.AMPRIONModelContainer = "AMPRIONModelContainer";
136
136
  ClassNames.INTEGRALModelContainer = "INTEGRALModelContainer";
137
137
  // AssetInfo
138
+ ClassNames.OverheadWireInfo = "OverheadWireInfo";
139
+ ClassNames.CableInfo = "CableInfo";
138
140
  ClassNames.AMPRIONOverheadWireInfo = "AMPRIONOverheadWireInfo";
139
141
  ClassNames.AMPRIONCableWireInfo = "AMPRIONCableWireInfo";
140
142
  //ModelDescription
@@ -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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"}
@@ -157,6 +157,7 @@ export declare class DLConverterI7 {
157
157
  * result is either [Terminal-UUID, ConnectivityNode-UUID, Terminal-UUID] or []
158
158
  */
159
159
  private findConnectionAsUuidsBetweenTwoConductingEquipments;
160
+ private adjustTransformerTerminalPositions;
160
161
  private createTerminalDiagramObjectFromPoints;
161
162
  private alreadyExported;
162
163
  }
@@ -563,17 +563,13 @@ class DLConverterI7 {
563
563
  if (terminal1DiagramObject && doAKnotenConnectivityNode) {
564
564
  const dopAKnotenConnectivityNode = doAKnotenConnectivityNode.diagramObjectPoints[0];
565
565
  util_functions_1.DLUtilFunctions.copyAndPushDiagramObjectPoint(terminal1DiagramObject, dopAKnotenConnectivityNode, false);
566
- }
567
- else {
568
- console.log('');
566
+ this.adjustTransformerTerminalPositions(terminal1DiagramObject, powerTransformerDiagramObject);
569
567
  }
570
568
  const doEKnotenConnectivityNode = this.getExportedDiagramObjectBy(nsgTrafo2w.variantennr, netzTrafo2W.eknoten);
571
569
  if (terminal2DiagramObject && doEKnotenConnectivityNode) {
572
570
  const dopEKnotenConnectivityNode = doEKnotenConnectivityNode.diagramObjectPoints[0];
573
571
  util_functions_1.DLUtilFunctions.copyAndPushDiagramObjectPoint(terminal2DiagramObject, dopEKnotenConnectivityNode, false);
574
- }
575
- else {
576
- console.log('');
572
+ this.adjustTransformerTerminalPositions(terminal2DiagramObject, powerTransformerDiagramObject);
577
573
  }
578
574
  return createdDiagramObjects;
579
575
  });
@@ -673,10 +669,10 @@ class DLConverterI7 {
673
669
  if (terminal1DiagramObject && w1TypedResult) {
674
670
  const w1ConnectivityNodePosition = yield this.getConnectivityNodePositionFor(w1TypedResult.type, w1TypedResult.object);
675
671
  util_functions_1.DLUtilFunctions.copyAndPushXYCoordinates(terminal1DiagramObject, w1ConnectivityNodePosition, false);
676
- }
677
- else {
678
- const powerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUUID);
679
- console.log(powerTransformer);
672
+ this.adjustTransformerTerminalPositions(terminal1DiagramObject, powerTransformerDiagramObject);
673
+ // } else {
674
+ // const powerTransformer: PowerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUUID);
675
+ // console.log(powerTransformer)
680
676
  }
681
677
  const w2TypedResult = this.dbObjectGraph.findTypedFirstByKey(convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, {
682
678
  variantennr: nsgTrafo3w.variantennr, id: nsgTrafo3w.anschluss_w2
@@ -684,10 +680,10 @@ class DLConverterI7 {
684
680
  if (terminal2DiagramObject && w2TypedResult) {
685
681
  const w2ConnectivityNodePosition = yield this.getConnectivityNodePositionFor(w2TypedResult.type, w2TypedResult.object);
686
682
  util_functions_1.DLUtilFunctions.copyAndPushXYCoordinates(terminal2DiagramObject, w2ConnectivityNodePosition, false);
687
- }
688
- else {
689
- const powerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUUID);
690
- console.log(powerTransformer);
683
+ this.adjustTransformerTerminalPositions(terminal2DiagramObject, powerTransformerDiagramObject);
684
+ // } else {
685
+ // const powerTransformer: PowerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUUID);
686
+ // console.log(powerTransformer)
691
687
  }
692
688
  const w3TypedResult = this.dbObjectGraph.findTypedFirstByKey(convert_graph_keys_1.i7SchemaKeyNames.VariantenNrIdKey, {
693
689
  variantennr: nsgTrafo3w.variantennr, id: nsgTrafo3w.anschluss_w3
@@ -695,10 +691,10 @@ class DLConverterI7 {
695
691
  if (terminal3DiagramObject && w3TypedResult) {
696
692
  const w3ConnectivityNodePosition = yield this.getConnectivityNodePositionFor(w3TypedResult.type, w3TypedResult.object);
697
693
  util_functions_1.DLUtilFunctions.copyAndPushXYCoordinates(terminal3DiagramObject, w3ConnectivityNodePosition, false);
698
- }
699
- else {
700
- const powerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUUID);
701
- console.log(powerTransformer);
694
+ this.adjustTransformerTerminalPositions(terminal3DiagramObject, powerTransformerDiagramObject);
695
+ // } else {
696
+ // const powerTransformer: PowerTransformer = this.cimModelGraph.findObjectByUUID(powerTransformerUUID);
697
+ // console.log(powerTransformer)
702
698
  }
703
699
  return createdDiagramObjects;
704
700
  });
@@ -3593,6 +3589,22 @@ class DLConverterI7 {
3593
3589
  }
3594
3590
  return [];
3595
3591
  }
3592
+ adjustTransformerTerminalPositions(terminalDiagramObject, transformerDiagramObject) {
3593
+ if (terminalDiagramObject.diagramObjectPoints.length === 2 && transformerDiagramObject.diagramObjectPoints.length === 1) {
3594
+ const firstDiagramObjectPoint = terminalDiagramObject.diagramObjectPoints[0];
3595
+ const secondDiagramObjectPoint = terminalDiagramObject.diagramObjectPoints[1];
3596
+ if (firstDiagramObjectPoint.xPosition === secondDiagramObjectPoint.xPosition
3597
+ && firstDiagramObjectPoint.yPosition === secondDiagramObjectPoint.yPosition) {
3598
+ const v1 = [firstDiagramObjectPoint.xPosition, firstDiagramObjectPoint.yPosition];
3599
+ const v2 = [transformerDiagramObject.diagramObjectPoints[0].xPosition, transformerDiagramObject.diagramObjectPoints[0].yPosition];
3600
+ const v = [v2[0] - v1[0], v2[1] - v1[1]];
3601
+ const lengthOfV = util_functions_1.DLUtilFunctions.euclideanMetric(v2, v1);
3602
+ util_functions_1.DLUtilFunctions.inplaceNormalize(v);
3603
+ firstDiagramObjectPoint.xPosition += v[0] * (lengthOfV * 0.3);
3604
+ firstDiagramObjectPoint.yPosition += v[1] * (lengthOfV * 0.3);
3605
+ }
3606
+ }
3607
+ }
3596
3608
  createTerminalDiagramObjectFromPoints(args) {
3597
3609
  if (args.points) {
3598
3610
  const terminalDiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPoints([...args.points], null);