@enervance/insight-cim-model 0.0.272 → 0.0.273
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/constants/cim-class-names.d.ts +1 -0
- package/dist/constants/cim-class-names.js +1 -0
- package/dist/constants/cim-class-names.js.map +1 -1
- package/dist/constants/rdf-xml.d.ts +2 -0
- package/dist/constants/rdf-xml.js +2 -0
- package/dist/constants/rdf-xml.js.map +1 -1
- package/dist/converter/integral7/converter.integral7.d.ts +1 -0
- package/dist/converter/integral7/converter.integral7.js +45 -30
- package/dist/converter/integral7/converter.integral7.js.map +1 -1
- package/dist/converter/integral7/interface-i7/export-frame-i7.js +10 -1
- package/dist/converter/integral7/interface-i7/export-frame-i7.js.map +1 -1
- package/dist/converter/integral7/utils-cgmes-export.d.ts +2 -1
- package/dist/converter/integral7/utils-cgmes-export.js +8 -3
- package/dist/converter/integral7/utils-cgmes-export.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +5 -3
- package/dist/index.js.map +1 -1
- package/dist/model/core/ConnectivityNode.js +2 -4
- package/dist/model/core/ConnectivityNode.js.map +1 -1
- package/dist/model/core/IdentifiedObject.js +8 -0
- package/dist/model/core/IdentifiedObject.js.map +1 -1
- package/dist/model/extensions/amprion/core/AMPRIONConnectivityNode.js +6 -0
- package/dist/model/extensions/amprion/core/AMPRIONConnectivityNode.js.map +1 -1
- package/dist/model/extensions/amprion/project/AMPRIONDerivedErpProjectPhase.d.ts +8 -0
- package/dist/model/extensions/amprion/project/AMPRIONDerivedErpProjectPhase.js +56 -0
- package/dist/model/extensions/amprion/project/AMPRIONDerivedErpProjectPhase.js.map +1 -0
- package/dist/model/topology/TopologicalNode.d.ts +8 -0
- package/dist/model/topology/TopologicalNode.js +11 -4
- package/dist/model/topology/TopologicalNode.js.map +1 -1
- package/dist/model-container/model/AMPRIONModelContainer.d.ts +4 -0
- package/dist/model-container/model/AMPRIONModelContainer.js +8 -0
- package/dist/model-container/model/AMPRIONModelContainer.js.map +1 -1
- package/dist/utils2/cim.model.utils.js +2 -0
- package/dist/utils2/cim.model.utils.js.map +1 -1
- package/dist/utils2/parser.utils.js +2 -2
- package/dist/utils2/parser.utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -152,6 +152,7 @@ export declare class ClassNames {
|
|
|
152
152
|
static readonly ACLineSegmentPhase = "ACLineSegmentPhase";
|
|
153
153
|
static readonly AMPRIONConstructionProject = "AMPRIONConstructionProject";
|
|
154
154
|
static readonly AMPRIONErpProjectPhase = "AMPRIONErpProjectPhase";
|
|
155
|
+
static readonly AMPRIONDerivedErpProjectPhase = "AMPRIONDerivedErpProjectPhase";
|
|
155
156
|
static readonly AMPRIONConstructionProjectBundle = "AMPRIONConstructionProjectBundle";
|
|
156
157
|
static readonly AMPRIONConstructionProjectPlan = "AMPRIONConstructionProjectPlan";
|
|
157
158
|
static readonly AMPRIONErpProject = "AMPRIONErpProject";
|
|
@@ -187,6 +187,7 @@ ClassNames.AMPRIONACLineSubSegment = "AMPRIONACLineSubSegment";
|
|
|
187
187
|
ClassNames.ACLineSegmentPhase = "ACLineSegmentPhase";
|
|
188
188
|
ClassNames.AMPRIONConstructionProject = "AMPRIONConstructionProject";
|
|
189
189
|
ClassNames.AMPRIONErpProjectPhase = "AMPRIONErpProjectPhase";
|
|
190
|
+
ClassNames.AMPRIONDerivedErpProjectPhase = "AMPRIONDerivedErpProjectPhase";
|
|
190
191
|
ClassNames.AMPRIONConstructionProjectBundle = "AMPRIONConstructionProjectBundle";
|
|
191
192
|
ClassNames.AMPRIONConstructionProjectPlan = "AMPRIONConstructionProjectPlan";
|
|
192
193
|
ClassNames.AMPRIONErpProject = "AMPRIONErpProject";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cim-class-names.js","sourceRoot":"","sources":["../../src/constants/cim-class-names.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cim-class-names.js","sourceRoot":"","sources":["../../src/constants/cim-class-names.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,7 @@ export declare class RDF_XML {
|
|
|
32
32
|
static readonly GL_OPER_PROFILE_URI = "http://entsoe.eu/CIM/GeographicalLocation/2/1";
|
|
33
33
|
static readonly BD_EQ_PROFILE_URI = "http://entsoe.eu/CIM/EquipmentBoundary/3/1";
|
|
34
34
|
static readonly BD_EQ_OPER_PROFILE_URI = "http://entsoe.eu/CIM/EquipmentBoundaryOperation/3/1";
|
|
35
|
+
static readonly BD_TP_PROFILE_URI = "http://entsoe.eu/CIM/TopologyBoundary/3/1";
|
|
35
36
|
static readonly ADDITIONAL_PROFILE_URI = "http://enervance.com/CIM/AdditionalData/1/0";
|
|
36
37
|
static readonly AMP_I7_PROFILE_URI = "http://amprion.net/CIM/AmprionIntegral7/1/0";
|
|
37
38
|
static readonly AMP_MAS = "http://www.amprion.net/TransitionPlanning";
|
|
@@ -49,6 +50,7 @@ export declare class RDF_XML {
|
|
|
49
50
|
static readonly PROFILE_TP = "TP";
|
|
50
51
|
static readonly PROFILE_DY = "DY";
|
|
51
52
|
static readonly PROFILE_EQ_BD = "EQ_BD";
|
|
53
|
+
static readonly PROFILE_TP_BD = "TP_BD";
|
|
52
54
|
static readonly PROFILE_ADDITIONAL = "ADDITIONAL";
|
|
53
55
|
static readonly PROFILE_AMPI7 = "AMPI7";
|
|
54
56
|
static readonly cgmesProfileNamespaces: {
|
|
@@ -37,6 +37,7 @@ RDF_XML.DL_OPER_PROFILE_URI = "http://entsoe.eu/CIM/DiagramLayout/3/1";
|
|
|
37
37
|
RDF_XML.GL_OPER_PROFILE_URI = "http://entsoe.eu/CIM/GeographicalLocation/2/1";
|
|
38
38
|
RDF_XML.BD_EQ_PROFILE_URI = "http://entsoe.eu/CIM/EquipmentBoundary/3/1";
|
|
39
39
|
RDF_XML.BD_EQ_OPER_PROFILE_URI = "http://entsoe.eu/CIM/EquipmentBoundaryOperation/3/1";
|
|
40
|
+
RDF_XML.BD_TP_PROFILE_URI = "http://entsoe.eu/CIM/TopologyBoundary/3/1";
|
|
40
41
|
RDF_XML.ADDITIONAL_PROFILE_URI = "http://enervance.com/CIM/AdditionalData/1/0";
|
|
41
42
|
RDF_XML.AMP_I7_PROFILE_URI = "http://amprion.net/CIM/AmprionIntegral7/1/0";
|
|
42
43
|
RDF_XML.AMP_MAS = "http://www.amprion.net/TransitionPlanning";
|
|
@@ -54,6 +55,7 @@ RDF_XML.PROFILE_GL = 'GL';
|
|
|
54
55
|
RDF_XML.PROFILE_TP = 'TP';
|
|
55
56
|
RDF_XML.PROFILE_DY = 'DY';
|
|
56
57
|
RDF_XML.PROFILE_EQ_BD = 'EQ_BD';
|
|
58
|
+
RDF_XML.PROFILE_TP_BD = 'TP_BD';
|
|
57
59
|
RDF_XML.PROFILE_ADDITIONAL = 'ADDITIONAL';
|
|
58
60
|
RDF_XML.PROFILE_AMPI7 = 'AMPI7';
|
|
59
61
|
RDF_XML.cgmesProfileNamespaces = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rdf-xml.js","sourceRoot":"","sources":["../../src/constants/rdf-xml.ts"],"names":[],"mappings":";;;AAAA,MAAa,OAAO;;AAApB,
|
|
1
|
+
{"version":3,"file":"rdf-xml.js","sourceRoot":"","sources":["../../src/constants/rdf-xml.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,7 @@ export declare class ConverterIntegral7 {
|
|
|
71
71
|
* @return ein Promise mit Statusangabe */
|
|
72
72
|
convert(objectMappingConfig: ObjectMappingConfigInterface, defaultValuesConfig: DefaultValuesConfigInterface, energyTypesConfig: any, exportConfig: IExportConfig[], energySourceTypeMappingConfig: IEnergySourceTypeMapping[], configUuid: Array<IUuidConfig>, tempDirPath: string): Promise<ConverterStatus>;
|
|
73
73
|
convertFrame(frame: I7ExportFrame, geoRegion: GeographicalRegion, objectMappingConfig: ObjectMappingConfigInterface, energyTypesConfig: any, defaultValuesConfig: DefaultValuesConfigInterface, energySourceTypeMappingConfig: IEnergySourceTypeMapping[]): Promise<void>;
|
|
74
|
+
private findTopologicalNode;
|
|
74
75
|
createTopologicalNodes(cimModel: ModelContainer): Promise<void>;
|
|
75
76
|
createDCTopologicalNodes(cimModel: ModelContainer): Promise<void>;
|
|
76
77
|
private assignTerminalSequenceNumber;
|
|
@@ -266,7 +266,6 @@ class ConverterIntegral7 {
|
|
|
266
266
|
if (!geoRegion)
|
|
267
267
|
continue;
|
|
268
268
|
/** Boundary Profil 'umformen'*/
|
|
269
|
-
console.log('Transform MAS Profiles');
|
|
270
269
|
yield this.transformBoundaryModel(frame, [...this.exportFrames.values()]);
|
|
271
270
|
frame.validateCIMModel();
|
|
272
271
|
const startTime = perf_hooks.performance.now();
|
|
@@ -557,13 +556,29 @@ class ConverterIntegral7 {
|
|
|
557
556
|
logExecutionTime(this.logger, startTime, `assignment of sequence number`);
|
|
558
557
|
/** TopologicalNodes */
|
|
559
558
|
startTime = perf_hooks.performance.now();
|
|
560
|
-
|
|
561
|
-
yield this.createTopologicalNodes(cimModel);
|
|
562
|
-
logExecutionTime(this.logger, startTime, `createTopologicalNodes()`);
|
|
563
|
-
startTime = perf_hooks.performance.now();
|
|
564
|
-
if (schaltfeldIDs.length)
|
|
565
|
-
yield this.createTopologicalNodes(cimModel);
|
|
559
|
+
yield this.createTopologicalNodes(cimModel);
|
|
566
560
|
logExecutionTime(this.logger, startTime, `createTopologicalNodes()`);
|
|
561
|
+
/** TopologicalNodes From- und To-Attribute setzen*/
|
|
562
|
+
/** Suche alle Terminals mit nicht ausgeprägten ConnectivityNode
|
|
563
|
+
* Siche das ConnectivityNode in BoundaryFrames */
|
|
564
|
+
const boundaryTerminals = [...cimModel.terminals.values()].filter(it => (!it.connectivityNode && it.getConnectivityNodeUUID()));
|
|
565
|
+
const boundaryConnectivityNodesUUIDs = boundaryTerminals.map(it => it.getConnectivityNodeUUID());
|
|
566
|
+
const boundaryConnectivityNodes = [];
|
|
567
|
+
for (const boundaryFrame of this.exportFramesBoundary.values()) {
|
|
568
|
+
boundaryConnectivityNodes.push(...[...boundaryFrame.cimModel.connectivityNodes.values()].filter(it => boundaryConnectivityNodesUUIDs.includes(it.mrid)));
|
|
569
|
+
}
|
|
570
|
+
for (const boundaryConnectivityNode of boundaryConnectivityNodes) {
|
|
571
|
+
const tp = this.findTopologicalNode(boundaryConnectivityNode.topologicalNodeUUID);
|
|
572
|
+
if (!tp)
|
|
573
|
+
continue;
|
|
574
|
+
tp.boundaryPoint = true;
|
|
575
|
+
tp.fromEndIsoCode = boundaryConnectivityNode.fromEndIsoCode;
|
|
576
|
+
tp.fromEndName = boundaryConnectivityNode.fromEndName;
|
|
577
|
+
tp.fromEndNameTso = boundaryConnectivityNode.fromEndNameTso;
|
|
578
|
+
tp.toEndIsoCode = boundaryConnectivityNode.toEndIsoCode;
|
|
579
|
+
tp.toEndName = boundaryConnectivityNode.toEndName;
|
|
580
|
+
tp.toEndNameTso = boundaryConnectivityNode.toEndNameTso;
|
|
581
|
+
}
|
|
567
582
|
/** DL Profile */
|
|
568
583
|
if (!frame.boundary) {
|
|
569
584
|
this.executor = new executor_1.Executor(this.mysqlController, this.configUuid);
|
|
@@ -649,6 +664,11 @@ class ConverterIntegral7 {
|
|
|
649
664
|
}
|
|
650
665
|
});
|
|
651
666
|
}
|
|
667
|
+
findTopologicalNode(uuid) {
|
|
668
|
+
return ([...this.exportFramesBoundary.values()].find(it => {
|
|
669
|
+
return it.cimModel.getTopologicalNode(uuid);
|
|
670
|
+
})).cimModel.getTopologicalNode(uuid);
|
|
671
|
+
}
|
|
652
672
|
createTopologicalNodes(cimModel) {
|
|
653
673
|
var _a, _b, _c;
|
|
654
674
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -1031,9 +1051,6 @@ class ConverterIntegral7 {
|
|
|
1031
1051
|
const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid);
|
|
1032
1052
|
const vl = new VoltageLevel_1.VoltageLevel(common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.VoltageLevel, this.configUuid, rdfid), i7Data.bezeichner, i7Data.kurzname);
|
|
1033
1053
|
const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, i7Data.bezeichner, i7Data.kurzname, i7Data.kommentar);
|
|
1034
|
-
if (connectivityNode.getUUID() === '98d0e9eb-bfb0-4da4-9700-660626da1c56' || connectivityNode.getName() === 'XDU_SL12') {
|
|
1035
|
-
let stop = true;
|
|
1036
|
-
}
|
|
1037
1054
|
connectivityNode.setConnectivityNodeContainer(vl);
|
|
1038
1055
|
vl.addConnectivityNode(connectivityNode);
|
|
1039
1056
|
connectivityNode.nodeNumber = i7Data.id_psse_cape;
|
|
@@ -2198,13 +2215,12 @@ class ConverterIntegral7 {
|
|
|
2198
2215
|
equivalentInjection.q_ki = q_ki;
|
|
2199
2216
|
const p = (p_ein ? p_ein : 0) + (p_sKonst ? p_sKonst : 0) + (p_ki ? p_ki : 0);
|
|
2200
2217
|
const q = (q_ein ? q_ein : 0) + (q_sKonst ? q_sKonst : 0) + (q_ki ? q_ki : 0);
|
|
2201
|
-
if (i7Data.guid === '_dc09c365-ca51-4e10-964c-fc99b33e98dd') {
|
|
2202
|
-
console.log();
|
|
2203
|
-
}
|
|
2204
2218
|
equivalentInjection.p = p;
|
|
2205
2219
|
equivalentInjection.q = q;
|
|
2206
2220
|
equivalentInjection.einspeisePrio = einspeisePrio;
|
|
2207
2221
|
equivalentInjection.kr = kr;
|
|
2222
|
+
equivalentInjection.rExt = r_ext;
|
|
2223
|
+
equivalentInjection.xExt = x_ext;
|
|
2208
2224
|
equivalentInjection.aggregate = true; // default Wert im I7 Export. Not needed for EquivalentInjection, BusbarSection, PowerTransformerEnd, EquivalentShunt, EquivalentBranch
|
|
2209
2225
|
this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data, targetVoltages);
|
|
2210
2226
|
// ToDo PSRType
|
|
@@ -2220,7 +2236,7 @@ class ConverterIntegral7 {
|
|
|
2220
2236
|
const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.BOUNDARYINJECTION, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION), knotenSfIDs));
|
|
2221
2237
|
switch (targetClass) {
|
|
2222
2238
|
case cim_class_names_1.ClassNames.EquivalentInjection: {
|
|
2223
|
-
yield this.
|
|
2239
|
+
yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, targetVoltages, result);
|
|
2224
2240
|
break;
|
|
2225
2241
|
}
|
|
2226
2242
|
case cim_class_names_1.ClassNames.ExternalNetworkInjection: {
|
|
@@ -2228,8 +2244,7 @@ class ConverterIntegral7 {
|
|
|
2228
2244
|
break;
|
|
2229
2245
|
}
|
|
2230
2246
|
default: {
|
|
2231
|
-
|
|
2232
|
-
yield this.convertBoundaryInjections2EquivalentInjection(cimModel, targetVoltages, result);
|
|
2247
|
+
yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, targetVoltages, result);
|
|
2233
2248
|
}
|
|
2234
2249
|
}
|
|
2235
2250
|
}
|
|
@@ -5405,6 +5420,7 @@ class ConverterIntegral7 {
|
|
|
5405
5420
|
cimModel.substations.delete(substation.mrid);
|
|
5406
5421
|
cimModel.removeObject(substation);
|
|
5407
5422
|
cimModel.addLine(line);
|
|
5423
|
+
/** Connectivity Nodes als boundary nodes markieren */
|
|
5408
5424
|
}
|
|
5409
5425
|
});
|
|
5410
5426
|
}
|
|
@@ -5649,15 +5665,6 @@ class ConverterIntegral7 {
|
|
|
5649
5665
|
if (cimModel.objects.has(anschlussUUID)) {
|
|
5650
5666
|
// Anschluss befindet sich im selben Modell
|
|
5651
5667
|
terminal = this.createConnection(cimModel, conductingEquipment, cimModel.getObject(anschlussUUID), phase, true);
|
|
5652
|
-
// cn = terminal.getConnectivityNode();
|
|
5653
|
-
// if (cn === undefined) {
|
|
5654
|
-
// cn = cimModel.getConnectivityNode(terminal.getConnectivityNodeUUID());
|
|
5655
|
-
// }
|
|
5656
|
-
// if (cn !== undefined) {
|
|
5657
|
-
// /** keep reference to boundary connectivity node in terminal as association */
|
|
5658
|
-
// terminal.setConnectivityNodeUUID(cn.getUUID());
|
|
5659
|
-
// }
|
|
5660
|
-
//cimModel.addTerminal(terminal);
|
|
5661
5668
|
}
|
|
5662
5669
|
else {
|
|
5663
5670
|
// Anschluss befindet sich im Boundary-Modell
|
|
@@ -5965,10 +5972,12 @@ class ConverterIntegral7 {
|
|
|
5965
5972
|
for (const frame of boundaryFrames) {
|
|
5966
5973
|
this.addDefaultObjectsLoadModel(frame.cimModel, defaultValuesConfig);
|
|
5967
5974
|
this.addDefaultObjectsGeo(frame.cimModel, defaultValuesConfig);
|
|
5968
|
-
frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.
|
|
5969
|
-
// GL als DependentModel
|
|
5975
|
+
frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_TP_BD, rdf_xml_1.RDF_XML.PROFILE_EQ_BD, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_DL], tempDirPath, this.configUuid);
|
|
5976
|
+
// GL und DL als DependentModel
|
|
5970
5977
|
frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_GL, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
|
|
5971
5978
|
frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_DL, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
|
|
5979
|
+
frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_TP_BD, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
|
|
5980
|
+
// EQ als DependentModel muss zur Laufzeit gesetzt werden
|
|
5972
5981
|
}
|
|
5973
5982
|
this.exportFramesBoundary = this.associateGeoRegionsToExportFrames(boundaryFrames);
|
|
5974
5983
|
const gridFrames = this.initExportFrames(gridExports, geoRegions, allSubGeoRegions);
|
|
@@ -6856,6 +6865,7 @@ class ConverterIntegral7 {
|
|
|
6856
6865
|
}
|
|
6857
6866
|
}
|
|
6858
6867
|
annotateBoundaryNode(name, isoCode, tsoName, connectivityNode) {
|
|
6868
|
+
connectivityNode.boundaryPoint = true;
|
|
6859
6869
|
if (connectivityNode.fromEndName === undefined) {
|
|
6860
6870
|
connectivityNode.boundaryPoint = true;
|
|
6861
6871
|
connectivityNode.fromEndName = name;
|
|
@@ -6863,7 +6873,6 @@ class ConverterIntegral7 {
|
|
|
6863
6873
|
connectivityNode.fromEndNameTso = tsoName;
|
|
6864
6874
|
}
|
|
6865
6875
|
else if (connectivityNode.toEndName === undefined) {
|
|
6866
|
-
connectivityNode.boundaryPoint = true;
|
|
6867
6876
|
connectivityNode.toEndName = name;
|
|
6868
6877
|
connectivityNode.toEndIsoCode = isoCode;
|
|
6869
6878
|
connectivityNode.toEndNameTso = tsoName;
|
|
@@ -6939,8 +6948,14 @@ function getGeoCoordinates(i7Data) {
|
|
|
6939
6948
|
else if (/^(4[0-9]{6})/.test(gkZone)) {
|
|
6940
6949
|
epsg = 'EPSG:31468';
|
|
6941
6950
|
}
|
|
6942
|
-
|
|
6943
|
-
|
|
6951
|
+
/** nur wenn EPSG Code bestimmt werden kann*/
|
|
6952
|
+
if (epsg.length) {
|
|
6953
|
+
const points = geodata_util_1.GeodataUtil.convertPoint(+i7Data.geokoor_gk_rechts, +i7Data.geokoor_gk_hoch, epsg);
|
|
6954
|
+
return [String(points[0]), String(points[1])];
|
|
6955
|
+
}
|
|
6956
|
+
else {
|
|
6957
|
+
console.log(`Gauss-Kruger-$Geokoordinaten für Standort ${i7Data.id} ${i7Data.geokoor_gk_rechts} ${i7Data.geokoor_gk_hoch} konnten nicht konvertiert werden`);
|
|
6958
|
+
}
|
|
6944
6959
|
}
|
|
6945
6960
|
return undefined;
|
|
6946
6961
|
}
|