@enervance/insight-cim-model 0.0.162 → 0.0.164

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 (74) hide show
  1. package/dist/constants/cim-class-names.d.ts +0 -2
  2. package/dist/constants/cim-class-names.js +0 -2
  3. package/dist/constants/cim-class-names.js.map +1 -1
  4. package/dist/converter/integral7/converter.integral7.d.ts +4 -0
  5. package/dist/converter/integral7/converter.integral7.js +10 -10
  6. package/dist/converter/integral7/converter.integral7.js.map +1 -1
  7. package/dist/converter/integral7/dl-convert/data-manager.d.ts +2 -0
  8. package/dist/converter/integral7/dl-convert/data-manager.js +4 -0
  9. package/dist/converter/integral7/dl-convert/data-manager.js.map +1 -1
  10. package/dist/converter/integral7/dl-convert/dl-converter-i7.d.ts +4 -1
  11. package/dist/converter/integral7/dl-convert/dl-converter-i7.js +91 -29
  12. package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
  13. package/dist/converter/integral7/dl-convert/executor.d.ts +3 -2
  14. package/dist/converter/integral7/dl-convert/executor.js +17 -12
  15. package/dist/converter/integral7/dl-convert/executor.js.map +1 -1
  16. package/dist/etl/etl-neplan/etl-neplan.js +9 -1
  17. package/dist/etl/etl-neplan/etl-neplan.js.map +1 -1
  18. package/dist/index.d.ts +0 -2
  19. package/dist/index.js +0 -3
  20. package/dist/index.js.map +1 -1
  21. package/dist/interfaces/model/wires/IRegulatingCondEq.d.ts +0 -3
  22. package/dist/model/assetinfo/CableInfo.d.ts +0 -7
  23. package/dist/model/assetinfo/CableInfo.js +0 -49
  24. package/dist/model/assetinfo/CableInfo.js.map +1 -1
  25. package/dist/model/assetinfo/OverheadWireInfo.d.ts +0 -7
  26. package/dist/model/assetinfo/OverheadWireInfo.js +0 -49
  27. package/dist/model/assetinfo/OverheadWireInfo.js.map +1 -1
  28. package/dist/model/assets/Facility.js +3 -17
  29. package/dist/model/assets/Facility.js.map +1 -1
  30. package/dist/model/assets/LifecycleDate.d.ts +0 -1
  31. package/dist/model/assets/LifecycleDate.js +0 -3
  32. package/dist/model/assets/LifecycleDate.js.map +1 -1
  33. package/dist/model/common/Location.js +1 -1
  34. package/dist/model/common/Location.js.map +1 -1
  35. package/dist/model/core/ACDCTerminal.js +1 -2
  36. package/dist/model/core/ACDCTerminal.js.map +1 -1
  37. package/dist/model/core/Substation.js +7 -7
  38. package/dist/model/core/Substation.js.map +1 -1
  39. package/dist/model/dc/DCLine.js +17 -17
  40. package/dist/model/dc/DCLineSegment.js +25 -25
  41. package/dist/model/equivalents/EquivalentInjection.d.ts +0 -10
  42. package/dist/model/equivalents/EquivalentInjection.js +0 -111
  43. package/dist/model/equivalents/EquivalentInjection.js.map +1 -1
  44. package/dist/model/extensions/enervance/assets/EVWireObject.js +1 -7
  45. package/dist/model/extensions/enervance/assets/EVWireObject.js.map +1 -1
  46. package/dist/model/loadmodel/ConformLoadGroup.js +22 -22
  47. package/dist/model/loadmodel/LoadArea.js +21 -21
  48. package/dist/model/loadmodel/SubLoadArea.js +22 -22
  49. package/dist/model/wires/ACLineSegment.d.ts +0 -3
  50. package/dist/model/wires/ACLineSegment.js +1 -7
  51. package/dist/model/wires/ACLineSegment.js.map +1 -1
  52. package/dist/model/wires/ExternalNetworkInjection.js.map +1 -1
  53. package/dist/model/wires/PowerTransformer.js +0 -2
  54. package/dist/model/wires/PowerTransformer.js.map +1 -1
  55. package/dist/model/wires/PowerTransformerEnd.js +0 -1
  56. package/dist/model/wires/PowerTransformerEnd.js.map +1 -1
  57. package/dist/model/wires/RatioTapChanger.js +1 -1
  58. package/dist/model-container/enum/EVSourceSystemKind.d.ts +0 -1
  59. package/dist/model-container/enum/EVSourceSystemKind.js +0 -1
  60. package/dist/model-container/enum/EVSourceSystemKind.js.map +1 -1
  61. package/dist/utils2/cim.model.utils.js +0 -6
  62. package/dist/utils2/cim.model.utils.js.map +1 -1
  63. package/dist/utils2/common.utils.d.ts +0 -1
  64. package/dist/utils2/common.utils.js +0 -3
  65. package/dist/utils2/common.utils.js.map +1 -1
  66. package/dist/utils2/fuseki.utils.js +1 -7
  67. package/dist/utils2/fuseki.utils.js.map +1 -1
  68. package/dist/utils2/import.utils.d.ts +1 -2
  69. package/dist/utils2/import.utils.js +3 -9
  70. package/dist/utils2/import.utils.js.map +1 -1
  71. package/package.json +6 -2
  72. package/dist/etl/etl-dppower/etl-dppower.d.ts +0 -15
  73. package/dist/etl/etl-dppower/etl-dppower.js +0 -204
  74. package/dist/etl/etl-dppower/etl-dppower.js.map +0 -1
@@ -9,7 +9,6 @@ export declare abstract class CommonUtils {
9
9
  static isCollection(value: any): boolean;
10
10
  static ifUndefined2Null(value: any, toString?: boolean): any | null;
11
11
  static instantiateObject<T>(obj: (new () => T)): T;
12
- static generateRandomNumber(min: number, max: number): number;
13
12
  /**
14
13
  * Prüft CIM Objekte auf Vorhandensein von UUID und MRIDs
15
14
  * Bei nicht vorhandenen UUID und MRIDs wird das Objekt um entsprechendes Property bzw. Ausprägung erweitert.
@@ -52,9 +52,6 @@ class CommonUtils {
52
52
  static instantiateObject(obj) {
53
53
  return new obj();
54
54
  }
55
- static generateRandomNumber(min, max) {
56
- return Math.floor(Math.random() * (max - min)) + min;
57
- }
58
55
  /**
59
56
  * Prüft CIM Objekte auf Vorhandensein von UUID und MRIDs
60
57
  * Bei nicht vorhandenen UUID und MRIDs wird das Objekt um entsprechendes Property bzw. Ausprägung erweitert.
@@ -1 +1 @@
1
- {"version":3,"file":"common.utils.js","sourceRoot":"","sources":["../../src/utils2/common.utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.utils.js","sourceRoot":"","sources":["../../src/utils2/common.utils.ts"],"names":[],"mappings":";;;AACA,mCAAoC;AACpC,+BAAoC;AAGpC,MAAsB,WAAW;IAExB,MAAM,CAAC,cAAc,CAAC,SAAiB,EAAE,UAA8B,EAAE,GAAW;QACzF,MAAM,UAAU,GAAgB,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;QAC7E,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,CAAA,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,kCAAkC,SAAS,aAAa,CAAC,CAAC;SACvE;QACD,OAAO,IAAA,SAAM,EAAC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC;IAGM,MAAM,CAAC,YAAY;QACxB,OAAO,IAAA,mBAAU,GAAE,CAAC;IACtB,CAAC;IAED,4CAA4C;IACrC,MAAM,CAAC,uBAAuB,CAAI,MAAS,EAAE,IAAgB;QAClE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACrC,IAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,GAAG,CAAC;gBAAE,SAAS;YACjC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;SACpB;IACH,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,KAAU;QAExC,IAAI,KAAK,YAAY,GAAG,EAAE;YACxB,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;SACnC;QACD,IAAI,KAAK,YAAY,GAAG,EAAE;YACxB,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;SACnC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,KAAK,CAAC;SACd;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,KAAU;QACnC,IAAI,KAAK,YAAY,GAAG,EAAE;YACxB,OAAO,IAAI,CAAC;SACb;QACD,IAAI,KAAK,YAAY,GAAG,EAAE;YACxB,OAAO,IAAI,CAAC;SACb;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,KAAU,EAAE,QAAkB;QAC3D,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAI,GAAkB;QACnD,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;IAED;;;SAGK;IACE,MAAM,CAAC,oBAAoB,CAAC,OAAkB;QACnD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAG,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE;gBACjC,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC,YAAY,EAAE,CAAC;aAC1C;iBACI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;gBACrB,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC,YAAY,EAAE,CAAC;aAC1C;SACF;IACH,CAAC;CACF;AAxED,kCAwEC;AAED;;;;GAIG;AACI,MAAM,UAAU,GAAG,CAAO,IAAgB,EAAE,EAAE,CAAC,IAAI,CAAC;AAA9C,QAAA,UAAU,cAAoC;AAE3D;;;;GAIG;AACI,MAAM,YAAY,GAAG,CAAO,OAA2B,SAAS,EAAE,EAAE,CAAC,CAAuB,IAAO,EAAK,EAAE,CAAC,IAAI,CAAC;AAA1G,QAAA,YAAY,gBAA8F;AAEvH;;;;GAIG;AACI,MAAM,mBAAmB,GAAG,CAAO,GAAU,EAAE,EAAE,CACtD,IAAI,KAAK,CAAC,EAAE,EAAE;IACZ,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI;IACtB,GAAG,EAAE,GAAG,EAAE;QACR,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACnC,CAAC;CACF,CAEA,CAAC;AARS,QAAA,mBAAmB,uBAQ5B"}
@@ -69,19 +69,13 @@ class JenaFusekiUtils {
69
69
  });
70
70
  }
71
71
  static deleteModelContainer(modelContainer, fusekiUrl) {
72
- var _a;
73
72
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
74
- console.log('Drop Apache Jena Fuseki graphs...');
75
73
  const graphsToDrop = [];
76
74
  graphsToDrop.push(`DROP GRAPH ${sparql_utils_1.SparqlUtils.checkGraphName(modelContainer.graphUri)}`);
77
75
  graphsToDrop.push(`DROP GRAPH ${sparql_utils_1.SparqlUtils.checkGraphName(modelContainer.getBaseModel().graphUri)}`);
78
76
  graphsToDrop.push(`DROP GRAPH ${sparql_utils_1.SparqlUtils.checkGraphName(modelContainer.getAlternateModel().graphUri)}`);
79
77
  const postRequestsSPARQL = JenaFusekiUtils.getPostRequests(fusekiUrl, 'post', graphsToDrop, 'application/sparql-update');
80
- const response = yield JenaFusekiUtils.postData(postRequestsSPARQL);
81
- for (let i = 0; i < response.length; i++) {
82
- console.log(`\t${graphsToDrop[i]} status ${(_a = response[i]) === null || _a === void 0 ? void 0 : _a.status}`);
83
- }
84
- return response;
78
+ return yield JenaFusekiUtils.postData(postRequestsSPARQL);
85
79
  });
86
80
  }
87
81
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"fuseki.utils.js","sourceRoot":"","sources":["../../src/utils2/fuseki.utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fuseki.utils.js","sourceRoot":"","sources":["../../src/utils2/fuseki.utils.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,9 @@
1
1
  import { IFusekiPostResponse } from './fuseki.utils.js';
2
2
  import { RdfModel } from '../rdf/RdfModel.js';
3
3
  import { EVSourceSystemKind } from '../model-container/enum/EVSourceSystemKind.js';
4
- import { EVModelsContainer } from '../model-container/model/EVModelsContainer.js';
5
4
  export declare abstract class ImportUtils {
6
5
  static importRdfModelIntoFuseki(fusekiUrl: string, rdfModelData: string[], graphUri: string): Promise<IFusekiPostResponse[]>;
7
- static importInitialNetworkDataIntoFuseki(fusekiUrl: string, rdfModel: RdfModel, networkName: string, sourceSystem: EVSourceSystemKind, modelVersion: string, xmlData: string[]): Promise<EVModelsContainer>;
6
+ static importInitialNetworkDataIntoFuseki(fusekiUrl: string, rdfModel: RdfModel, networkName: string, sourceSystem: EVSourceSystemKind, modelVersion: string, xmlData: string[]): Promise<IFusekiPostResponse[]>;
8
7
  /** Allegemeine Methode zum Import der CIM XML Daten nach Apache Jena Fuseki */
9
8
  static importCimXmlToFuseki(fusekiUrl: string, graphUri: string, cimXmlData: string[]): Promise<IFusekiPostResponse[]>;
10
9
  }
@@ -16,9 +16,7 @@ class ImportUtils {
16
16
  });
17
17
  }
18
18
  static importInitialNetworkDataIntoFuseki(fusekiUrl, rdfModel, networkName, sourceSystem, modelVersion, xmlData) {
19
- var _a;
20
19
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
21
- console.log(`Importing xml grid data`);
22
20
  const evModelsGraphURI = `http://${common_utils_1.CommonUtils.generateUUID()}/${networkName}`;
23
21
  const evBaseModelGraphURI = `http://${common_utils_1.CommonUtils.generateUUID()}/${networkName}/base`;
24
22
  const evAlternateModelGraphURI = `http://${common_utils_1.CommonUtils.generateUUID()}/${networkName}/alternate`;
@@ -33,17 +31,13 @@ class ImportUtils {
33
31
  evModelContainerNetzvarianten.modelsContainer = modelsConstainer;
34
32
  modelsConstainer.addModel(evModelContainerNetzvarianten);
35
33
  const modelsSparqls = sparql_utils_1.SparqlUtils.createSPARQLStatement(sparql_utils_1.SparqlType.INSERT_DATA, modelsConstainer, modelsConstainer.graphUri, rdfModel, baseUrl);
36
- console.log('modelsSparqls');
37
- console.log(modelsSparqls);
38
34
  const baseModelSparqls = sparql_utils_1.SparqlUtils.createSPARQLStatement(sparql_utils_1.SparqlType.INSERT_DATA, evModelContainerBestandsnetz, evModelContainerBestandsnetz.graphUri, rdfModel, baseUrl);
39
35
  const alternateModelSparqls = sparql_utils_1.SparqlUtils.createSPARQLStatement(sparql_utils_1.SparqlType.INSERT_DATA, evModelContainerNetzvarianten, evModelContainerNetzvarianten.graphUri, rdfModel, baseUrl);
40
36
  const postRequestsXML = fuseki_utils_1.JenaFusekiUtils.getPostRequests(fusekiUrl, 'post', xmlData, 'application/rdf+xml;charset=utf-8', evBaseModelGraphURI);
41
37
  const postRequestsSPARQL = fuseki_utils_1.JenaFusekiUtils.getPostRequests(fusekiUrl, 'post', [modelsSparqls, baseModelSparqls, alternateModelSparqls], 'application/sparql-update');
42
- const response = yield fuseki_utils_1.JenaFusekiUtils.postData([...postRequestsXML, ...postRequestsSPARQL]);
43
- for (let i = 0; i < response.length; i++) {
44
- console.log(`\tImport grid data: status ${(_a = response[i]) === null || _a === void 0 ? void 0 : _a.status}`);
45
- }
46
- return modelsConstainer;
38
+ const resposes = yield fuseki_utils_1.JenaFusekiUtils.postData([...postRequestsXML, ...postRequestsSPARQL]);
39
+ resposes.forEach(it => it.objects = [modelsConstainer]);
40
+ return resposes;
47
41
  });
48
42
  }
49
43
  /** Allegemeine Methode zum Import der CIM XML Daten nach Apache Jena Fuseki */
@@ -1 +1 @@
1
- {"version":3,"file":"import.utils.js","sourceRoot":"","sources":["../../src/utils2/import.utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"import.utils.js","sourceRoot":"","sources":["../../src/utils2/import.utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@enervance/insight-cim-model",
3
- "version": "0.0.162",
3
+ "version": "0.0.164",
4
4
  "description": "CIM data model",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -89,6 +89,10 @@
89
89
  "webpack-cli": "^4.2.0",
90
90
  "webpack-dev-server": "^3.11.0",
91
91
  "uuid": "^9.0.1",
92
- "complex.js": "^2.1.1"
92
+ "complex.js": "^2.1.1",
93
+ "jest": "^29.7.0",
94
+ "jest-cli": "^29.7.0",
95
+ "jest-extended": "^4.0.2",
96
+ "ts-jest": "^29.1.1"
93
97
  }
94
98
  }
@@ -1,15 +0,0 @@
1
- import { PowerSystemResource } from '../../model/core/PowerSystemResource.js';
2
- import { ClassNames } from '../../constants/cim-class-names.js';
3
- import { EVModelContainer } from '../../model-container/model/EVModelContainer.js';
4
- import { ConductingEquipment } from '../../model/core/ConductingEquipment.js';
5
- export declare abstract class EtlDpPower {
6
- /**
7
- * Erstellt für ConnectivityNodes das Assetmodell.
8
- * @param modelContainer Netzmodel
9
- * */
10
- static createAssetModel(className: Partial<ClassNames>, graphURI: string, psrObjects: Map<string, PowerSystemResource>): string;
11
- static enrichRegulatingControl(baseModel: EVModelContainer): string;
12
- static enrichConductingEquipmentPsrTypes(conductingEquipments: Array<ConductingEquipment>, baseModel: EVModelContainer): string;
13
- static convertGeoCoordinates(baseModel: EVModelContainer): string;
14
- static checkAndEnhanceDataQuality(baseModel: EVModelContainer): string;
15
- }
@@ -1,204 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.EtlDpPower = void 0;
4
- const common_utils_1 = require("../../utils2/common.utils.js");
5
- const sparql_utils_1 = require("../../util/sparql/sparql-utils.js");
6
- const Facility_1 = require("../../model/assets/Facility.js");
7
- const EVWireObject_1 = require("../../model/extensions/enervance/assets/EVWireObject.js");
8
- const cim_class_names_1 = require("../../constants/cim-class-names.js");
9
- const ExternalNetworkInjection_1 = require("../../model/wires/ExternalNetworkInjection.js");
10
- const RegulatingControl_1 = require("../../model/wires/RegulatingControl.js");
11
- const sparql_utils_2 = require("../../utils2/sparql.utils.js");
12
- const Terminal_1 = require("../../model/core/Terminal.js");
13
- const RegulatingControlModeKind_1 = require("../../model/wires/RegulatingControlModeKind.js");
14
- const util_search_1 = require("../../util/util-search.js");
15
- const geodata_util_1 = require("../../util/geodata.util.js");
16
- class EtlDpPower {
17
- /**
18
- * Erstellt für ConnectivityNodes das Assetmodell.
19
- * @param modelContainer Netzmodel
20
- * */
21
- static createAssetModel(className, graphURI, psrObjects) {
22
- const createObjectsSPARQL = [];
23
- const addReleationsSPARQL = [];
24
- let facility;
25
- for (const psr of psrObjects.values()) {
26
- switch (className) {
27
- case cim_class_names_1.ClassNames.EVWireObject: {
28
- facility = new EVWireObject_1.EVWireObject(common_utils_1.CommonUtils.generateUUID(), psr.mrid, '', '');
29
- break;
30
- }
31
- default: {
32
- facility = new Facility_1.Facility(common_utils_1.CommonUtils.generateUUID(), psr.mrid, '', '');
33
- break;
34
- }
35
- }
36
- facility.baseIRI = psr.baseIRI;
37
- const installationDate = common_utils_1.CommonUtils.generateRandomNumber(1950, 2023);
38
- facility.setLifecycleDate(String(installationDate), 'installationDate');
39
- /** Psr <-> Facility */
40
- createObjectsSPARQL.push(facility.createNewStatementSPARQL());
41
- addReleationsSPARQL.push(facility.addPowerSystemResource(psr));
42
- }
43
- return `
44
- PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
45
- PREFIX enervance: <http://enervance.com/CIM/Extensions#>
46
- PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
47
- PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
48
-
49
- ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, [...createObjectsSPARQL, ...addReleationsSPARQL])}
50
- `;
51
- }
52
- static enrichRegulatingControl(baseModel) {
53
- var _a;
54
- const graphURI = baseModel.getGraphURI();
55
- const maxBaseVoltage = [...baseModel.baseVoltages.values()].reduce((prev, current) => (prev && prev.nominalVoltage.value > current.nominalVoltage.value) ? prev : current);
56
- const powerTransformerSupply = (_a = [...baseModel.powerTransformerEnds.values()].filter(it => { var _a; return ((_a = it.baseVoltage) === null || _a === void 0 ? void 0 : _a.mrid) === (maxBaseVoltage === null || maxBaseVoltage === void 0 ? void 0 : maxBaseVoltage.mrid); })) === null || _a === void 0 ? void 0 : _a.map(it => it.powerTransformer);
57
- if (!powerTransformerSupply.length)
58
- console.log('There are no Supply-PowerTransformer');
59
- const newObjects = [];
60
- const createObjectsSPARQL = [];
61
- for (const powerTransformer of powerTransformerSupply) {
62
- const powerTransformerEnd = powerTransformer.powerTransformerEnd.find(it => it.ratioTapChanger);
63
- const ratioTapChanger = powerTransformerEnd.ratioTapChanger;
64
- const terminal = powerTransformerEnd.terminal;
65
- if (!terminal) {
66
- console.log('EnrichRegulatingControl: PowerTransfomer kein Terminal-Objekt ');
67
- continue;
68
- }
69
- const connectivityNode = terminal.connectivityNode;
70
- if (!connectivityNode) {
71
- console.log('EnrichRegulatingControl: PowerTransfomer kein ConnectivityNode am Terminal-Objekt ');
72
- continue;
73
- }
74
- const targetVoltage = ratioTapChanger.neutralU;
75
- const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(common_utils_1.CommonUtils.generateUUID(), 'SlackNode');
76
- externalNetworkInjection.referencePriority = 1;
77
- externalNetworkInjection.controlEnabled = true;
78
- const terminalEni = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), 'SlackTerminal');
79
- terminalEni.connectivityNode = connectivityNode;
80
- terminalEni.conductingEquipment = externalNetworkInjection;
81
- terminalEni.connected = true;
82
- const regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), 'SlackNode controller');
83
- regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
84
- regulatingControl.targetValue = targetVoltage;
85
- regulatingControl.enabled = true;
86
- regulatingControl.terminal = terminal;
87
- externalNetworkInjection.regulatingControl = regulatingControl;
88
- regulatingControl.addRegulatingCondEq(externalNetworkInjection);
89
- newObjects.push(externalNetworkInjection);
90
- newObjects.push(regulatingControl);
91
- newObjects.push(terminalEni);
92
- }
93
- newObjects.forEach(it => createObjectsSPARQL.push(...sparql_utils_2.SparqlUtils.getSparqlStatementFromCIM(sparql_utils_2.SparqlType.INSERT_DATA, baseModel.modelsContainer.getRdfModel(), it, baseModel.getBaseIRI())));
94
- if (createObjectsSPARQL.length) {
95
- return `PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
96
- PREFIX cim:<http://iec.ch/TC57/2013/CIM-schema-cim16#>
97
- PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
98
- PREFIX enervance: <http://enervance.com/CIM/Extensions#>
99
- PREFIX westnetzneplan: <http://westnetzneplan.de/CIM/Extensions#>
100
- ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, createObjectsSPARQL)}
101
- `;
102
- }
103
- else {
104
- return;
105
- }
106
- }
107
- static enrichConductingEquipmentPsrTypes(conductingEquipments, baseModel) {
108
- const graphURI = baseModel.getGraphURI();
109
- const insertSPARQL = [];
110
- /** PSR Type */
111
- /* const typeList = ['Photovoltaik', 'Bio'];
112
- const randomType = typeList[Math.floor(Math.random())];*/
113
- const psrType = (0, util_search_1.getObjectByProperty)(baseModel.psrTypes, 'name', 'Photovoltaik');
114
- for (const conductingEquipment of conductingEquipments) {
115
- insertSPARQL.push(conductingEquipment.setPsrType(psrType));
116
- }
117
- return `
118
- PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
119
- PREFIX enervance: <http://enervance.com/CIM/Extensions#>
120
- PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
121
- PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
122
-
123
- ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, insertSPARQL)}
124
- `;
125
- }
126
- static convertGeoCoordinates(baseModel) {
127
- var _a, _b;
128
- const graphURI = baseModel.getGraphURI();
129
- const insertDataSPARQL = [];
130
- const deletePropertySPARQL = [];
131
- for (const location of baseModel.locations.values()) {
132
- if (((_a = location === null || location === void 0 ? void 0 : location.coordinateSystem) === null || _a === void 0 ? void 0 : _a.crsUrn) !== 'urn:ogc:def:uom:EPSG::3006')
133
- continue;
134
- deletePropertySPARQL.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(location.baseIRI, location === null || location === void 0 ? void 0 : location.coordinateSystem.mrid, 'cim', 'CoordinateSystem', 'crsUrn'));
135
- insertDataSPARQL.push(location.getPropertySparqlTriple(location.baseIRI, location === null || location === void 0 ? void 0 : location.coordinateSystem.mrid, 'cim', 'CoordinateSystem', 'crsUrn', 'urn:ogc:def:uom:EPSG::4326'));
136
- (_b = location === null || location === void 0 ? void 0 : location.positionPoints) === null || _b === void 0 ? void 0 : _b.forEach((point) => {
137
- if (+point.xPosition > 0 && +point.yPosition > 0) {
138
- deletePropertySPARQL.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(location.baseIRI, point.mrid, 'cim', 'PositionPoint', 'xPosition'));
139
- deletePropertySPARQL.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(location.baseIRI, point.mrid, 'cim', 'PositionPoint', 'yPosition'));
140
- const points = geodata_util_1.GeodataUtil.convertPoint(+point.xPosition, +point.yPosition, 'EPSG:3006');
141
- insertDataSPARQL.push(location.getPropertySparqlTriple(location.baseIRI, point.mrid, 'cim', 'PositionPoint', 'xPosition', String(points[0])));
142
- insertDataSPARQL.push(location.getPropertySparqlTriple(location.baseIRI, point.mrid, 'cim', 'PositionPoint', 'yPosition', String(points[1])));
143
- }
144
- });
145
- }
146
- const length = insertDataSPARQL.length + deletePropertySPARQL.length;
147
- if (length) {
148
- return `
149
- PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>
150
- PREFIX cim:<http://iec.ch/TC57/2013/CIM-schema-cim16#>
151
- PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
152
- PREFIX enervance: <http://enervance.com/CIM/Extensions#>
153
- PREFIX westnetzneplan: <http://westnetzneplan.de/CIM/Extensions#>
154
-
155
- ${(0, sparql_utils_1.getDeleteWhereValuesPartStatement)(graphURI, deletePropertySPARQL)}
156
- ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, insertDataSPARQL)}
157
-
158
-
159
- `;
160
- }
161
- else {
162
- return;
163
- }
164
- }
165
- static checkAndEnhanceDataQuality(baseModel) {
166
- const graphURI = baseModel.getGraphURI();
167
- const insertSPARQL = [];
168
- const deletePropertySPARQL = [];
169
- /** Bei Terminal-Objekten ist das Attribut 'connected' nicht ausgeprägt. Setze alle Terminals auf connected = true */
170
- for (const terminal of baseModel.terminals.values()) {
171
- insertSPARQL.push(terminal.getPropertySparqlTriple(terminal.baseIRI, terminal.mrid, 'cim', 'ACDCTerminal', 'connected', 'true'));
172
- }
173
- /** Bei Terminal-Objekten ist das Attribut 'connected' nicht ausgeprägt. Setze alle Terminals auf connected = true */
174
- for (const transformerEnd of baseModel.powerTransformerEnds.values()) {
175
- if (isNaN(transformerEnd.r)) {
176
- deletePropertySPARQL.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(transformerEnd.baseIRI, transformerEnd.mrid, 'cim', 'PowerTransformerEnd', 'r'));
177
- insertSPARQL.push(transformerEnd.getPropertySparqlTriple(transformerEnd.baseIRI, transformerEnd.mrid, 'cim', 'PowerTransformerEnd', 'r', '0'));
178
- }
179
- if (isNaN(transformerEnd.x)) {
180
- deletePropertySPARQL.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(transformerEnd.baseIRI, transformerEnd.mrid, 'cim', 'PowerTransformerEnd', 'x'));
181
- insertSPARQL.push(transformerEnd.getPropertySparqlTriple(transformerEnd.baseIRI, transformerEnd.mrid, 'cim', 'PowerTransformerEnd', 'x', '0'));
182
- }
183
- if (isNaN(transformerEnd.b)) {
184
- deletePropertySPARQL.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(transformerEnd.baseIRI, transformerEnd.mrid, 'cim', 'PowerTransformerEnd', 'b'));
185
- insertSPARQL.push(transformerEnd.getPropertySparqlTriple(transformerEnd.baseIRI, transformerEnd.mrid, 'cim', 'PowerTransformerEnd', 'b', '0'));
186
- }
187
- if (isNaN(transformerEnd.g)) {
188
- deletePropertySPARQL.push((0, sparql_utils_1.getDeleteWhereObjectSPARQL)(transformerEnd.baseIRI, transformerEnd.mrid, 'cim', 'PowerTransformerEnd', 'g'));
189
- insertSPARQL.push(transformerEnd.getPropertySparqlTriple(transformerEnd.baseIRI, transformerEnd.mrid, 'cim', 'PowerTransformerEnd', 'g', '0'));
190
- }
191
- }
192
- return `
193
- PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
194
- PREFIX enervance: <http://enervance.com/CIM/Extensions#>
195
- PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
196
- PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
197
-
198
- ${(0, sparql_utils_1.getDeleteWhereValuesPartStatement)(graphURI, deletePropertySPARQL)}
199
- ${(0, sparql_utils_1.getInsertDataPartStatement)(graphURI, insertSPARQL)}
200
- `;
201
- }
202
- }
203
- exports.EtlDpPower = EtlDpPower;
204
- //# sourceMappingURL=etl-dppower.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"etl-dppower.js","sourceRoot":"","sources":["../../../src/etl/etl-dppower/etl-dppower.ts"],"names":[],"mappings":"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"}