@enervance/insight-cim-model 0.0.311 → 0.0.313
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 +6 -1
- package/dist/converter/integral7/converter.integral7.js.map +1 -1
- package/dist/model/core/Substation.js +1 -1
- package/dist/model/extensions/amprion/core/INTEGRALSubstation.js +1 -1
- package/dist/model/topology/TopologicalNode.js +1 -2
- package/dist/model/topology/TopologicalNode.js.map +1 -1
- package/dist/model/wires/EnergyConsumer.js +1 -1
- package/dist/model/wires/EnergySource.js +1 -1
- package/dist/model/wires/PowerTransformer.js +1 -1
- package/dist/model/wires/TransformerEnd.js +1 -2
- package/dist/model/wires/TransformerEnd.js.map +1 -1
- package/dist/utils2/parser.utils.d.ts +1 -1
- package/dist/utils2/parser.utils.js +13 -7
- package/dist/utils2/parser.utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -295,7 +295,7 @@ Substation.sparqlQuery = `
|
|
|
295
295
|
|
|
296
296
|
?sUUID rdf:type cim:Substation .
|
|
297
297
|
OPTIONAL { ?sUUID cim:IdentifiedObject.mrid ?mrid .}
|
|
298
|
-
OPTIONAL { ?sUUID fgh:IdentifiedObject.
|
|
298
|
+
OPTIONAL { ?sUUID fgh:IdentifiedObject.externalId ?externalId .}
|
|
299
299
|
OPTIONAL { ?sUUID cim:IdentifiedObject.name ?name .}
|
|
300
300
|
OPTIONAL { ?sUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
301
301
|
OPTIONAL { ?sUUID cim:IdentifiedObject.description ?description .}
|
|
@@ -102,7 +102,7 @@ INTEGRALSubstation.sparqlQuery = `
|
|
|
102
102
|
GRAPH <http://default/> {
|
|
103
103
|
?mrid rdf:type cim:Substation .
|
|
104
104
|
OPTIONAL { ?mrid cim:IdentifiedObject.name ?name .}
|
|
105
|
-
OPTIONAL { ?mrid fgh:IdentifiedObject.
|
|
105
|
+
OPTIONAL { ?mrid fgh:IdentifiedObject.externalId ?externalId .}
|
|
106
106
|
OPTIONAL { ?mrid entsoe:IdentifiedObject.shortName ?shortName .}
|
|
107
107
|
OPTIONAL { ?mrid cim:IdentifiedObject.description ?description .}
|
|
108
108
|
OPTIONAL { ?mrid fgh:Substation.number ?number .}
|
|
@@ -106,8 +106,7 @@ class TopologicalNode extends IdentifiedObject_1.IdentifiedObject {
|
|
|
106
106
|
this.connectivityNodeContainer.addTopologicalNode(this);
|
|
107
107
|
// else console.log(this.constructor.name + ' ' + this.mrid + ' hat keine connectivityNodeContainerInstanz ' + this.connectivityNodeContainerUUID);
|
|
108
108
|
this.baseVoltage = cimModel.getBaseVoltageByUUID(this.baseVoltageUUID);
|
|
109
|
-
if (!this.baseVoltage)
|
|
110
|
-
console.log(this.constructor.name + ' ' + this.mrid + ' hat keine BaseVoltageInstanz ' + this.baseVoltageUUID);
|
|
109
|
+
//if (!this.baseVoltage) console.log(this.constructor.name + ' ' + this.mrid + ' hat keine BaseVoltageInstanz ' + this.baseVoltageUUID);
|
|
111
110
|
}
|
|
112
111
|
computeBounds(profile, schemaSettings, diagramObject) {
|
|
113
112
|
const coordinates = diagramObject.computeRectBounds(diagramObject);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TopologicalNode.js","sourceRoot":"","sources":["../../../src/model/topology/TopologicalNode.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TopologicalNode.js","sourceRoot":"","sources":["../../../src/model/topology/TopologicalNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -237,7 +237,7 @@ EnergyConsumer.sparqlQuery = `
|
|
|
237
237
|
OPTIONAL{?econUUID cim:IdentifiedObject.name ?name .}
|
|
238
238
|
OPTIONAL{?econUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
239
239
|
OPTIONAL{?econUUID cim:IdentifiedObject.description ?description .}
|
|
240
|
-
OPTIONAL{?econUUID fgh:IdentifiedObject.
|
|
240
|
+
OPTIONAL{?econUUID fgh:IdentifiedObject.externalId ?externalId .}
|
|
241
241
|
OPTIONAL{?econUUID fgh:IdentifiedObject.key ?key .}
|
|
242
242
|
OPTIONAL{?econUUID cim:EnergyConsumer.p ?p .}
|
|
243
243
|
OPTIONAL{?econUUID cim:EnergyConsumer.q ?q .}
|
|
@@ -245,7 +245,7 @@ EnergySource.sparqlQuery = `
|
|
|
245
245
|
OPTIONAL{?esUUID cim:IdentifiedObject.name ?name .}
|
|
246
246
|
OPTIONAL{?esUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
247
247
|
OPTIONAL{?esUUID cim:IdentifiedObject.description ?description .}
|
|
248
|
-
OPTIONAL{?esUUID fgh:IdentifiedObject.
|
|
248
|
+
OPTIONAL{?esUUID fgh:IdentifiedObject.externalId ?externalId .}
|
|
249
249
|
OPTIONAL{?esUUID fgh:IdentifiedObject.key ?key .}
|
|
250
250
|
OPTIONAL{?esUUID cim:Equipment.aggregate ?aggregate .}
|
|
251
251
|
OPTIONAL{?esUUID cim:EnergySource.activePower ?activePower .}
|
|
@@ -305,7 +305,7 @@ PowerTransformer.sparqlQuery = `
|
|
|
305
305
|
OPTIONAL {?trUUID cim:IdentifiedObject.name ?name .}
|
|
306
306
|
OPTIONAL {?trUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
307
307
|
OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
|
|
308
|
-
OPTIONAL {?trUUID fgh:IdentifiedObject.
|
|
308
|
+
OPTIONAL {?trUUID fgh:IdentifiedObject.externalId ?externalId .}
|
|
309
309
|
OPTIONAL {?trUUID fgh:IdentifiedObject.key ?key .}
|
|
310
310
|
OPTIONAL {?trUUID enervance:IdentifiedObject.installation ?installation .}
|
|
311
311
|
OPTIONAL {?trUUID cim:IdentifiedObject.description ?description .}
|
|
@@ -49,8 +49,7 @@ class TransformerEnd extends IdentifiedObject_1.IdentifiedObject {
|
|
|
49
49
|
resolveParsedAssociations(cimModel) {
|
|
50
50
|
super.resolveParsedAssociations(cimModel);
|
|
51
51
|
this.baseVoltage = cimModel.getBaseVoltageByUUID(this.baseVoltageUUID);
|
|
52
|
-
if (!this.baseVoltage)
|
|
53
|
-
console.log(this.constructor.name + ' ' + this.mrid + ' hat keine BaseVoltageInstanz ' + this.baseVoltageUUID);
|
|
52
|
+
//if (!this.baseVoltage) console.log(this.constructor.name + ' ' + this.mrid + ' hat keine BaseVoltageInstanz ' + this.baseVoltageUUID);
|
|
54
53
|
//Terminal
|
|
55
54
|
this.terminal = cimModel.getTerminal(this.terminalUUID);
|
|
56
55
|
if (this.terminal)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransformerEnd.js","sourceRoot":"","sources":["../../../src/model/wires/TransformerEnd.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAK1D,qDAAgD;AAKhD,kEAAoF;AACpF,4DAAwD;AAExD,MAAa,cAAe,SAAQ,mCAAgB;IAmBlD,YAAY,IAAY,EAAE,IAAY,EAAE,SAAiB,EAAE,WAAmB,EAAE,SAAiB;QAC/F,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,kBAAkB,CAAC,eAAgC;QACxD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEM,WAAW,CAAC,KAAe;QAChC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACxB,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,YAAY,CAAC,KAAa;QAC/B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IAGM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IACM,kBAAkB;QACvB,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IACzE,CAAC;IAEM,cAAc,CAAC,WAAwB;QAC5C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;IAChE,CAAC;IAEM,eAAe,CAAC,YAAoB;QACzC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,2BAA2B,CAAC,KAAU;QAC3C,KAAK,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,0BAAW,CAAC,cAAc,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAChE,IAAI,CAAC,eAAe,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACtE,IAAI,CAAC,YAAY,GAAG,0BAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAElE,CAAC;IAEM,yBAAyB,CAAC,QAAwB;QACvD,KAAK,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAE1C,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACvE,
|
|
1
|
+
{"version":3,"file":"TransformerEnd.js","sourceRoot":"","sources":["../../../src/model/wires/TransformerEnd.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export declare abstract class ParserUtils {
|
|
|
8
8
|
static getValue(data: any, attributeName: string): string | undefined;
|
|
9
9
|
static getNumberValue(data: any, attributeName: any): number;
|
|
10
10
|
/** Sonderlösung für EVMetaObjects
|
|
11
|
-
|
|
11
|
+
* TODO Fuseki-Parser aus den CIM Klassen auslagern */
|
|
12
12
|
static getValueForJSON(data: any, attributeName: string): string | null;
|
|
13
13
|
static parseDate(data: any, attributeName: string): Date | null;
|
|
14
14
|
static parseStringToDate(dateString: string | unknown): Date | null;
|
|
@@ -22,7 +22,7 @@ class ParserUtils {
|
|
|
22
22
|
return undefined;
|
|
23
23
|
}
|
|
24
24
|
/** Sonderlösung für EVMetaObjects
|
|
25
|
-
|
|
25
|
+
* TODO Fuseki-Parser aus den CIM Klassen auslagern */
|
|
26
26
|
static getValueForJSON(data, attributeName) {
|
|
27
27
|
return (data === null || data === void 0 ? void 0 : data.hasOwnProperty(attributeName)) ? ParserUtils.parseNullOrUndefinedValues(data[attributeName].value) : null;
|
|
28
28
|
}
|
|
@@ -171,20 +171,26 @@ function getUUID(value, standardiseUuid = false) {
|
|
|
171
171
|
console.error(`UUID ist nicht definiert: ${value}`);
|
|
172
172
|
return common_utils_1.CommonUtils.generateUUID();
|
|
173
173
|
}
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
if (
|
|
178
|
-
console.error(`Ungültige UUID: ${value}`);
|
|
174
|
+
if (value.startsWith('_')) {
|
|
175
|
+
value = value.substring(1); // underscore abschneiden
|
|
176
|
+
}
|
|
177
|
+
if (!value.length) {
|
|
179
178
|
return common_utils_1.CommonUtils.generateUUID();
|
|
180
179
|
}
|
|
181
180
|
if (standardiseUuid) {
|
|
181
|
+
// Entferne alle nicht-hexadezimalen Zeichen wie Präfixe und Suffixe
|
|
182
|
+
const cleanedUUID = removeNonHexCharsFromUUID(value);
|
|
183
|
+
// Überprüfe, ob die bereinigte UUID 32 Zeichen lang ist
|
|
184
|
+
if (cleanedUUID.length !== 32) {
|
|
185
|
+
console.error(`Ungültige UUID: ${value}`);
|
|
186
|
+
return common_utils_1.CommonUtils.generateUUID();
|
|
187
|
+
}
|
|
182
188
|
// Formatiere die UUID gemäß RFC4122
|
|
183
189
|
const uuid = `${cleanedUUID.substring(0, 8)}-${cleanedUUID.substring(8, 12)}-${cleanedUUID.substring(12, 16)}-${cleanedUUID.substring(16, 20)}-${cleanedUUID.substring(20)}`;
|
|
184
190
|
return uuid.toLowerCase();
|
|
185
191
|
}
|
|
186
192
|
else {
|
|
187
|
-
return
|
|
193
|
+
return value;
|
|
188
194
|
}
|
|
189
195
|
}
|
|
190
196
|
exports.getUUID = getUUID;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.utils.js","sourceRoot":"","sources":["../../src/utils2/parser.utils.ts"],"names":[],"mappings":";;;;AAAA,iCAAiC;AACjC,4FAAyF;AACzF,wFAAqF;AACrF,wFAAqF;AACrF,iDAA6C;AAK7C,MAAsB,WAAW;IAExB,MAAM,CAAC,qBAAqB,CAAC,IAAY,EAAE,SAAiB;QACjE,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,IAAS,EAAE,aAAqB;QACrD,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,CAAC,aAAa,CAAC,EAAC,CAAC,CAAC,WAAW,CAAC,0BAA0B,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7H,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,IAAS,EAAE,aAAkB;QACxD,IAAI,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE;YACtC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC;YACzC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SAC3C;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.utils.js","sourceRoot":"","sources":["../../src/utils2/parser.utils.ts"],"names":[],"mappings":"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"}
|