@enervance/insight-cim-model 0.0.145 → 0.0.147
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/config/westnetz-neplan/callbacks/cb-connectivitynode.d.ts +3 -1
- package/dist/config/westnetz-neplan/callbacks/cb-connectivitynode.js +4 -3
- package/dist/config/westnetz-neplan/callbacks/cb-connectivitynode.js.map +1 -1
- package/dist/converter/integral7/converter.integral7.js +1 -7
- package/dist/converter/integral7/converter.integral7.js.map +1 -1
- package/dist/converter/integral7/interface-i7/export-frame-i7.js.map +1 -1
- package/dist/converter/integral7/utils.js +0 -3
- package/dist/converter/integral7/utils.js.map +1 -1
- package/dist/model/core/Bay.d.ts +1 -1
- package/dist/model/core/ConductingEquipment.js +1 -0
- package/dist/model/core/ConductingEquipment.js.map +1 -1
- package/dist/model/core/Equipment.d.ts +1 -1
- package/dist/model/core/Equipment.js +1 -3
- package/dist/model/core/Equipment.js.map +1 -1
- package/dist/model/core/Terminal.js +0 -2
- package/dist/model/core/Terminal.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/ConformLoad.js +33 -33
- 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/market-management/Point.d.ts +0 -4
- package/dist/model/market-management/Point.js +0 -14
- package/dist/model/market-management/Point.js.map +1 -1
- package/dist/model/market-management/TimeSeries.d.ts +0 -2
- package/dist/model/market-management/TimeSeries.js +0 -11
- package/dist/model/market-management/TimeSeries.js.map +1 -1
- package/dist/model/wires/ACLineSegment.d.ts +1 -1
- package/dist/model/wires/ACLineSegment.js +9 -10
- package/dist/model/wires/ACLineSegment.js.map +1 -1
- package/dist/model/wires/ExternalNetworkInjection.js +1 -0
- package/dist/model/wires/ExternalNetworkInjection.js.map +1 -1
- package/dist/model/wires/RegulatingCondEq.js +4 -2
- package/dist/model/wires/RegulatingCondEq.js.map +1 -1
- package/dist/model/wires/SynchronousMachine.d.ts +1 -2
- package/dist/model/wires/SynchronousMachine.js +0 -33
- package/dist/model/wires/SynchronousMachine.js.map +1 -1
- package/dist/util/util-create.js +0 -7
- package/dist/util/util-create.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { Asset, ConnectivityNode, ModelContainer } from "../../../index.js";
|
|
2
1
|
import { TripleData } from '../../../interfaces/persistence.interfaces.js';
|
|
2
|
+
import { ModelContainer } from '../../../model-container/model/ModelContainer.js';
|
|
3
|
+
import { ConnectivityNode } from '../../../model/core/ConnectivityNode.js';
|
|
4
|
+
import { Asset } from '../../../model/assets/Asset.js';
|
|
3
5
|
export declare const WNConnectivityNodeCallbacks: {
|
|
4
6
|
readonly cnFacilityHealthEvent: (cimModel: ModelContainer, icn: ConnectivityNode, data: any) => TripleData;
|
|
5
7
|
readonly cnFacilityAssetOwner: (cimModel: ModelContainer, icn: ConnectivityNode, data: any) => TripleData;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.determineZuwoReplacmentScore = exports.WNConnectivityNodeCallbacks = void 0;
|
|
4
|
-
const index_1 = require("../../../index.js");
|
|
5
4
|
const util_search_1 = require("../../../util/util-search.js");
|
|
6
5
|
const sparql_utils_1 = require("../../../util/sparql/sparql-utils.js");
|
|
7
6
|
const AnalyticKind_1 = require("../../../model/assets/AnalyticKind.js");
|
|
7
|
+
const AssetOwner_1 = require("../../../model/assets/AssetOwner.js");
|
|
8
|
+
const AssetUser_1 = require("../../../model/assets/AssetUser.js");
|
|
8
9
|
exports.WNConnectivityNodeCallbacks = {
|
|
9
10
|
cnFacilityHealthEvent: (cimModel, icn, data) => {
|
|
10
11
|
const cn = icn;
|
|
@@ -16,7 +17,7 @@ exports.WNConnectivityNodeCallbacks = {
|
|
|
16
17
|
const cn = icn;
|
|
17
18
|
for (const asset of cn.assets.values()) {
|
|
18
19
|
const facility = asset;
|
|
19
|
-
const oldAssociation = (0, util_search_1.getObjectByClass)(facility.organisationRoles,
|
|
20
|
+
const oldAssociation = (0, util_search_1.getObjectByClass)(facility.organisationRoles, AssetOwner_1.AssetOwner);
|
|
20
21
|
const newAssociation = (0, util_search_1.getObjectByProperty)(cimModel.assetOwners, 'name', data.propValue);
|
|
21
22
|
if (oldAssociation) {
|
|
22
23
|
try {
|
|
@@ -44,7 +45,7 @@ exports.WNConnectivityNodeCallbacks = {
|
|
|
44
45
|
const cn = icn;
|
|
45
46
|
for (const asset of cn.assets.values()) {
|
|
46
47
|
const facility = asset;
|
|
47
|
-
const oldAssociation = (0, util_search_1.getObjectByClass)(facility.organisationRoles,
|
|
48
|
+
const oldAssociation = (0, util_search_1.getObjectByClass)(facility.organisationRoles, AssetUser_1.AssetUser);
|
|
48
49
|
const newAssociation = (0, util_search_1.getObjectByProperty)(cimModel.assetUsers, 'name', data.propValue);
|
|
49
50
|
if (oldAssociation) {
|
|
50
51
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cb-connectivitynode.js","sourceRoot":"","sources":["../../../../src/config/westnetz-neplan/callbacks/cb-connectivitynode.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"cb-connectivitynode.js","sourceRoot":"","sources":["../../../../src/config/westnetz-neplan/callbacks/cb-connectivitynode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1170,11 +1170,9 @@ class ConverterIntegral7 {
|
|
|
1170
1170
|
switch (config.class) {
|
|
1171
1171
|
case 'ExternalNetworkInjection': {
|
|
1172
1172
|
yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, filtered);
|
|
1173
|
-
break;
|
|
1174
1173
|
}
|
|
1175
1174
|
case 'SynchronousMachine': {
|
|
1176
1175
|
yield this.convertEnergySourceToSynchronousMachine(cimModel, filtered);
|
|
1177
|
-
break;
|
|
1178
1176
|
}
|
|
1179
1177
|
}
|
|
1180
1178
|
}
|
|
@@ -1533,9 +1531,6 @@ class ConverterIntegral7 {
|
|
|
1533
1531
|
convertEnergySourceToSynchronousMachine(cimModel, result) {
|
|
1534
1532
|
for (const i7Data of result) {
|
|
1535
1533
|
try {
|
|
1536
|
-
if (i7Data.guid.toLowerCase().includes('_e11f3fe9-0b7a-4ff1-a0dc-214c4c3fd8cc')) {
|
|
1537
|
-
console.log();
|
|
1538
|
-
}
|
|
1539
1534
|
const synchronousMachine = new SynchronousMachine_1.SynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SM'], 32, true), i7Data.kurzname);
|
|
1540
1535
|
const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
|
|
1541
1536
|
const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
|
|
@@ -1571,7 +1566,6 @@ class ConverterIntegral7 {
|
|
|
1571
1566
|
synchronousMachine.controlEnabled = true;
|
|
1572
1567
|
regulatingControl.addRegulatingCondEq(synchronousMachine);
|
|
1573
1568
|
synchronousMachine.regulatingControlUUID = regulatingControl.getUUID();
|
|
1574
|
-
synchronousMachine.regulatingControl = regulatingControl;
|
|
1575
1569
|
cimModel.addRegulatingControl(regulatingControl);
|
|
1576
1570
|
break;
|
|
1577
1571
|
}
|
|
@@ -1579,7 +1573,7 @@ class ConverterIntegral7 {
|
|
|
1579
1573
|
synchronousMachine.controlEnabled = false;
|
|
1580
1574
|
}
|
|
1581
1575
|
}
|
|
1582
|
-
this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data
|
|
1576
|
+
this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data);
|
|
1583
1577
|
cimModel.addSynchronousMachine(synchronousMachine);
|
|
1584
1578
|
this.addIdMapping(i7Data.id, synchronousMachine.mrid, integral_sql_1.Integral7TableNames.GENERATOR);
|
|
1585
1579
|
}
|