@enervance/insight-cim-model 0.0.26 → 0.0.28
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/analysis/analysis-neplan/digi-ons.d.ts +5 -0
- package/dist/analysis/analysis-neplan/digi-ons.js +93 -113
- package/dist/analysis/analysis-neplan/digi-ons.js.map +1 -1
- package/dist/constants/rdf-xml.d.ts +3 -0
- package/dist/constants/rdf-xml.js +3 -0
- package/dist/constants/rdf-xml.js.map +1 -1
- package/dist/converter/integral7/ConverterIntegral7.d.ts +10 -8
- package/dist/converter/integral7/ConverterIntegral7.js +347 -853
- package/dist/converter/integral7/ConverterIntegral7.js.map +1 -1
- package/dist/converter/integral7/converter-i7.d.ts +175 -0
- package/dist/converter/integral7/converter-i7.js +3175 -0
- package/dist/converter/integral7/converter-i7.js.map +1 -0
- package/dist/converter/integral7/interface-i7/IUkzExportConfig.d.ts +5 -0
- package/dist/converter/integral7/interface-i7/{db-config.js → IUkzExportConfig.js} +1 -1
- package/dist/converter/integral7/interface-i7/IUkzExportConfig.js.map +1 -0
- package/dist/converter/integral7/interface-i7/data-structures-i7.d.ts +34 -0
- package/dist/converter/integral7/interface-i7/data-structures-i7.js +3 -0
- package/dist/converter/integral7/interface-i7/data-structures-i7.js.map +1 -0
- package/dist/converter/integral7/interface-i7/export-frame-i7.d.ts +20 -0
- package/dist/converter/integral7/interface-i7/export-frame-i7.js +185 -0
- package/dist/converter/integral7/interface-i7/export-frame-i7.js.map +1 -0
- package/dist/converter/integral7/model/interfaces.d.ts +6 -4
- package/dist/converter/integral7/sql/integral.sql.d.ts +2 -1
- package/dist/converter/integral7/sql/integral.sql.js +227 -2
- package/dist/converter/integral7/sql/integral.sql.js.map +1 -1
- package/dist/converter/integral7/utils-cgmes-export.d.ts +15 -0
- package/dist/converter/integral7/utils-cgmes-export.js +119 -0
- package/dist/converter/integral7/utils-cgmes-export.js.map +1 -0
- package/dist/converter/integral7/utils.d.ts +2 -6
- package/dist/converter/integral7/utils.js +11 -2
- package/dist/converter/integral7/utils.js.map +1 -1
- package/dist/etl/etl-neplan/etl-neplan-csv.js +47 -45
- package/dist/etl/etl-neplan/etl-neplan-csv.js.map +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/index.js.map +1 -1
- package/dist/model/assetinfo/PowerTransformerInfo.js +2 -2
- package/dist/model/assetinfo/PowerTransformerInfo.js.map +1 -1
- package/dist/model/assetinfo/TapChangerInfo.js +17 -15
- package/dist/model/assetinfo/TapChangerInfo.js.map +1 -1
- package/dist/model/assetinfo/TransformerEndInfo.js +7 -5
- package/dist/model/assetinfo/TransformerEndInfo.js.map +1 -1
- package/dist/model/assetinfo/WireInfo.js +4 -3
- package/dist/model/assetinfo/WireInfo.js.map +1 -1
- package/dist/model/common/CoordinateSystem.js +4 -2
- package/dist/model/common/CoordinateSystem.js.map +1 -1
- package/dist/model/common/Location.js +4 -3
- package/dist/model/common/Location.js.map +1 -1
- package/dist/model/common/PositionPoint.js +6 -5
- package/dist/model/common/PositionPoint.js.map +1 -1
- package/dist/model/core/ACDCTerminal.js +3 -2
- package/dist/model/core/ACDCTerminal.js.map +1 -1
- package/dist/model/core/BaseVoltage.js +5 -4
- package/dist/model/core/BaseVoltage.js.map +1 -1
- package/dist/model/core/Bay.d.ts +1 -1
- package/dist/model/core/Bay.js +9 -13
- package/dist/model/core/Bay.js.map +1 -1
- package/dist/model/core/ConductingEquipment.js +2 -1
- package/dist/model/core/ConductingEquipment.js.map +1 -1
- package/dist/model/core/ConnectivityNode.d.ts +8 -1
- package/dist/model/core/ConnectivityNode.js +16 -5
- package/dist/model/core/ConnectivityNode.js.map +1 -1
- package/dist/model/core/Curve.js +5 -5
- package/dist/model/core/Curve.js.map +1 -1
- package/dist/model/core/CurveData.js +8 -7
- package/dist/model/core/CurveData.js.map +1 -1
- package/dist/model/core/Equipment.js +5 -3
- package/dist/model/core/Equipment.js.map +1 -1
- package/dist/model/core/Feeder.js +4 -3
- package/dist/model/core/Feeder.js.map +1 -1
- package/dist/model/core/GeographicalRegion.js +3 -3
- package/dist/model/core/GeographicalRegion.js.map +1 -1
- package/dist/model/core/IdentifiedObject.js +5 -4
- package/dist/model/core/IdentifiedObject.js.map +1 -1
- package/dist/model/core/PSRType.js +2 -2
- package/dist/model/core/PSRType.js.map +1 -1
- package/dist/model/core/PowerSystemResource.js +2 -1
- package/dist/model/core/PowerSystemResource.js.map +1 -1
- package/dist/model/core/SubGeographicalRegion.js +5 -5
- package/dist/model/core/SubGeographicalRegion.js.map +1 -1
- package/dist/model/core/Substation.js +3 -3
- package/dist/model/core/Substation.js.map +1 -1
- package/dist/model/core/Terminal.js +7 -6
- package/dist/model/core/Terminal.js.map +1 -1
- package/dist/model/core/VoltageLevel.js +9 -7
- package/dist/model/core/VoltageLevel.js.map +1 -1
- package/dist/model/dc/ACDCConverter.js +22 -21
- package/dist/model/dc/ACDCConverter.js.map +1 -1
- package/dist/model/dc/ACDCConverterDCTerminal.js +4 -4
- package/dist/model/dc/ACDCConverterDCTerminal.js.map +1 -1
- package/dist/model/dc/CsConverter.js +18 -18
- package/dist/model/dc/CsConverter.js.map +1 -1
- package/dist/model/dc/DCBaseTerminal.js +3 -3
- package/dist/model/dc/DCBaseTerminal.js.map +1 -1
- package/dist/model/dc/DCConverterUnit.js +4 -4
- package/dist/model/dc/DCConverterUnit.js.map +1 -1
- package/dist/model/dc/DCLine.js +2 -2
- package/dist/model/dc/DCLine.js.map +1 -1
- package/dist/model/dc/DCLineSegment.js +6 -6
- package/dist/model/dc/DCLineSegment.js.map +1 -1
- package/dist/model/dc/DCNode.js +3 -3
- package/dist/model/dc/DCNode.js.map +1 -1
- package/dist/model/dc/DCTerminal.js +3 -3
- package/dist/model/dc/DCTerminal.js.map +1 -1
- package/dist/model/dc/VsConverter.js +17 -17
- package/dist/model/dc/VsConverter.js.map +1 -1
- package/dist/model/diagram/Diagram.js +4 -4
- package/dist/model/diagram/Diagram.js.map +1 -1
- package/dist/model/diagram/DiagramObject.js +8 -6
- package/dist/model/diagram/DiagramObject.js.map +1 -1
- package/dist/model/diagram/DiagramObjectPoint.js +7 -5
- package/dist/model/diagram/DiagramObjectPoint.js.map +1 -1
- package/dist/model/diagram/DiagramStyle.js +4 -3
- package/dist/model/diagram/DiagramStyle.js.map +1 -1
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/DynamicsFunctionBlock.js +2 -2
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/DynamicsFunctionBlock.js.map +1 -1
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineDynamics.js +2 -2
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineDynamics.js.map +1 -1
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineTimeConstantReactance.js +14 -14
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineTimeConstantReactance.js.map +1 -1
- package/dist/model/equivalents/EquivalentBranch.js +19 -17
- package/dist/model/equivalents/EquivalentBranch.js.map +1 -1
- package/dist/model/equivalents/EquivalentInjection.js +28 -27
- package/dist/model/equivalents/EquivalentInjection.js.map +1 -1
- package/dist/model/extensions/amprion/core/AMPRIONBay.js +5 -4
- package/dist/model/extensions/amprion/core/AMPRIONBay.js.map +1 -1
- package/dist/model/extensions/amprion/core/AMPRIONConnectivityNode.js +5 -5
- package/dist/model/extensions/amprion/core/AMPRIONConnectivityNode.js.map +1 -1
- package/dist/model/extensions/amprion/core/AMPRIONSubstation.js +4 -4
- package/dist/model/extensions/amprion/core/AMPRIONSubstation.js.map +1 -1
- package/dist/model/extensions/amprion/wires/AMPRIONSeriesCompensator.js +4 -4
- package/dist/model/extensions/amprion/wires/AMPRIONSeriesCompensator.js.map +1 -1
- package/dist/model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo.js +9 -8
- package/dist/model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo.js.map +1 -1
- package/dist/model/extensions/enervance/assetinfo/EVPowerTransformerInfo.js +9 -8
- package/dist/model/extensions/enervance/assetinfo/EVPowerTransformerInfo.js.map +1 -1
- package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js +14 -13
- package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js.map +1 -1
- package/dist/model/extensions/enervance/assets/EVWireObject.js +1 -1
- package/dist/model/extensions/enervance/assets/EVWireObject.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/assets/WNWireInfo.js +3 -2
- package/dist/model/extensions/neplan-westnetz/assets/WNWireInfo.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/core/WNConnectivityNode.js +2 -3
- package/dist/model/extensions/neplan-westnetz/core/WNConnectivityNode.js.map +1 -1
- package/dist/model/generation/FossilFuel.js +4 -4
- package/dist/model/generation/FossilFuel.js.map +1 -1
- package/dist/model/generation/GeneratingUnit.js +7 -6
- package/dist/model/generation/GeneratingUnit.js.map +1 -1
- package/dist/model/generation/HydroGeneratingUnit.js +3 -3
- package/dist/model/generation/HydroGeneratingUnit.js.map +1 -1
- package/dist/model/generation/SolarGeneratingUnit.js +2 -2
- package/dist/model/generation/SolarGeneratingUnit.js.map +1 -1
- package/dist/model/generation/ThermalGeneratingUnit.js +2 -2
- package/dist/model/generation/ThermalGeneratingUnit.js.map +1 -1
- package/dist/model/generation/WindGeneratingUnit.js +3 -3
- package/dist/model/generation/WindGeneratingUnit.js.map +1 -1
- package/dist/model/loadmodel/ConformLoad.js +3 -3
- package/dist/model/loadmodel/ConformLoad.js.map +1 -1
- package/dist/model/loadmodel/ConformLoadGroup.js +2 -2
- package/dist/model/loadmodel/ConformLoadGroup.js.map +1 -1
- package/dist/model/loadmodel/LoadArea.js +2 -2
- package/dist/model/loadmodel/LoadArea.js.map +1 -1
- package/dist/model/loadmodel/LoadGroup.js +2 -2
- package/dist/model/loadmodel/LoadGroup.js.map +1 -1
- package/dist/model/loadmodel/SubLoadArea.js +3 -3
- package/dist/model/loadmodel/SubLoadArea.js.map +1 -1
- package/dist/model/model/Model.d.ts +6 -1
- package/dist/model/model/Model.js +22 -10
- package/dist/model/model/Model.js.map +1 -1
- package/dist/model/operationallimits/CurrentLimit.js +3 -2
- package/dist/model/operationallimits/CurrentLimit.js.map +1 -1
- package/dist/model/operationallimits/OperationalLimit.js +3 -2
- package/dist/model/operationallimits/OperationalLimit.js.map +1 -1
- package/dist/model/operationallimits/OperationalLimitSet.js +3 -2
- package/dist/model/operationallimits/OperationalLimitSet.js.map +1 -1
- package/dist/model/operationallimits/OperationalLimitType.js +4 -4
- package/dist/model/operationallimits/OperationalLimitType.js.map +1 -1
- package/dist/model/operationallimits/VoltageLimit.d.ts +9 -0
- package/dist/model/operationallimits/VoltageLimit.js +38 -0
- package/dist/model/operationallimits/VoltageLimit.js.map +1 -0
- package/dist/model/statevariables/SvPowerFlow.js +5 -5
- package/dist/model/statevariables/SvPowerFlow.js.map +1 -1
- package/dist/model/statevariables/SvStatus.js +5 -5
- package/dist/model/statevariables/SvStatus.js.map +1 -1
- package/dist/model/statevariables/SvTapStep.js +5 -5
- package/dist/model/statevariables/SvTapStep.js.map +1 -1
- package/dist/model/topology/TopologicalNode.js +5 -4
- package/dist/model/topology/TopologicalNode.js.map +1 -1
- package/dist/model/wires/ACLineSegment.js +12 -11
- package/dist/model/wires/ACLineSegment.js.map +1 -1
- package/dist/model/wires/AsynchronousMachine.js +20 -20
- package/dist/model/wires/AsynchronousMachine.js.map +1 -1
- package/dist/model/wires/Breaker.js +2 -2
- package/dist/model/wires/Breaker.js.map +1 -1
- package/dist/model/wires/BusbarSection.js +3 -3
- package/dist/model/wires/BusbarSection.js.map +1 -1
- package/dist/model/wires/Conductor.js +2 -1
- package/dist/model/wires/Conductor.js.map +1 -1
- package/dist/model/wires/Disconnector.js +2 -2
- package/dist/model/wires/Disconnector.js.map +1 -1
- package/dist/model/wires/EarthFaultCompensator.js +2 -1
- package/dist/model/wires/EarthFaultCompensator.js.map +1 -1
- package/dist/model/wires/EnergyConsumer.js +8 -7
- package/dist/model/wires/EnergyConsumer.js.map +1 -1
- package/dist/model/wires/EnergySource.js +13 -12
- package/dist/model/wires/EnergySource.js.map +1 -1
- package/dist/model/wires/ExternalNetworkInjection.js +20 -19
- package/dist/model/wires/ExternalNetworkInjection.js.map +1 -1
- package/dist/model/wires/GroundingImpedance.js +3 -3
- package/dist/model/wires/GroundingImpedance.js.map +1 -1
- package/dist/model/wires/Junction.js +3 -3
- package/dist/model/wires/Junction.js.map +1 -1
- package/dist/model/wires/Line.js +6 -5
- package/dist/model/wires/Line.js.map +1 -1
- package/dist/model/wires/LinearShuntCompensator.js +6 -6
- package/dist/model/wires/LinearShuntCompensator.js.map +1 -1
- package/dist/model/wires/PetersenCoil.js +9 -9
- package/dist/model/wires/PetersenCoil.js.map +1 -1
- package/dist/model/wires/PhaseTapChanger.js +2 -2
- package/dist/model/wires/PhaseTapChanger.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerAsymmetrical.js +5 -5
- package/dist/model/wires/PhaseTapChangerAsymmetrical.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerLinear.js +9 -9
- package/dist/model/wires/PhaseTapChangerLinear.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerNonLinear.js +8 -8
- package/dist/model/wires/PhaseTapChangerNonLinear.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerSymmetrical.js +2 -2
- package/dist/model/wires/PhaseTapChangerSymmetrical.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerTable.js +2 -2
- package/dist/model/wires/PhaseTapChangerTable.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerTablePoint.js +4 -4
- package/dist/model/wires/PhaseTapChangerTablePoint.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerTabular.js +3 -3
- package/dist/model/wires/PhaseTapChangerTabular.js.map +1 -1
- package/dist/model/wires/PowerTransformer.js +3 -2
- package/dist/model/wires/PowerTransformer.js.map +1 -1
- package/dist/model/wires/PowerTransformerEnd.js +15 -14
- package/dist/model/wires/PowerTransformerEnd.js.map +1 -1
- package/dist/model/wires/RatioTapChanger.js +5 -5
- package/dist/model/wires/RatioTapChanger.js.map +1 -1
- package/dist/model/wires/RatioTapChangerTable.js +2 -2
- package/dist/model/wires/RatioTapChangerTable.js.map +1 -1
- package/dist/model/wires/RatioTapChangerTablePoint.js +4 -4
- package/dist/model/wires/RatioTapChangerTablePoint.js.map +1 -1
- package/dist/model/wires/ReactiveCapabilityCurve.js +2 -2
- package/dist/model/wires/ReactiveCapabilityCurve.js.map +1 -1
- package/dist/model/wires/RegulatingCondEq.js +3 -2
- package/dist/model/wires/RegulatingCondEq.js.map +1 -1
- package/dist/model/wires/RegulatingControl.js +9 -8
- package/dist/model/wires/RegulatingControl.js.map +1 -1
- package/dist/model/wires/RotatingMachine.js +8 -7
- package/dist/model/wires/RotatingMachine.js.map +1 -1
- package/dist/model/wires/SeriesCompensator.js +9 -8
- package/dist/model/wires/SeriesCompensator.js.map +1 -1
- package/dist/model/wires/ShuntCompensator.js +15 -15
- package/dist/model/wires/ShuntCompensator.js.map +1 -1
- package/dist/model/wires/StaticVarCompensator.js +14 -14
- package/dist/model/wires/StaticVarCompensator.js.map +1 -1
- package/dist/model/wires/Switch.js +4 -3
- package/dist/model/wires/Switch.js.map +1 -1
- package/dist/model/wires/SynchronousMachine.js +24 -23
- package/dist/model/wires/SynchronousMachine.js.map +1 -1
- package/dist/model/wires/TapChanger.js +10 -10
- package/dist/model/wires/TapChanger.js.map +1 -1
- package/dist/model/wires/TapChangerControl.js +2 -2
- package/dist/model/wires/TapChangerControl.js.map +1 -1
- package/dist/model/wires/TapChangerTablePoint.js +7 -7
- package/dist/model/wires/TapChangerTablePoint.js.map +1 -1
- package/dist/model/wires/TransformerEnd.js +7 -6
- package/dist/model/wires/TransformerEnd.js.map +1 -1
- package/dist/util/collection/util-dot.d.ts +2 -0
- package/dist/util/collection/util-dot.js +71 -0
- package/dist/util/collection/util-dot.js.map +1 -0
- package/dist/util/collection/util-excel.d.ts +10 -0
- package/dist/util/collection/util-excel.js +58 -0
- package/dist/util/collection/util-excel.js.map +1 -0
- package/dist/util/collection/util-graph.d.ts +7 -0
- package/dist/util/collection/util-graph.js +168 -0
- package/dist/util/collection/util-graph.js.map +1 -0
- package/dist/util/collection/util-graph2tree.d.ts +39 -0
- package/dist/util/collection/util-graph2tree.js +172 -0
- package/dist/util/collection/util-graph2tree.js.map +1 -0
- package/dist/util/collection/util-tree.d.ts +65 -0
- package/dist/util/collection/util-tree.js +236 -0
- package/dist/util/collection/util-tree.js.map +1 -0
- package/dist/util/database/mysql-controller.d.ts +16 -0
- package/dist/util/database/mysql-controller.js +45 -0
- package/dist/util/database/mysql-controller.js.map +1 -0
- package/dist/util/util-create.d.ts +1 -1
- package/dist/util/util-create.js.map +1 -1
- package/dist/util/utils.d.ts +0 -12
- package/dist/util/utils.js +2 -28
- package/dist/util/utils.js.map +1 -1
- package/dist/util/xml/xml.serializer.d.ts +12 -0
- package/dist/util/xml/xml.serializer.js +33 -3
- package/dist/util/xml/xml.serializer.js.map +1 -1
- package/package.json +4 -3
- package/dist/converter/integral7/interface-i7/I7Schema.d.ts +0 -13
- package/dist/converter/integral7/interface-i7/I7Schema.js +0 -13
- package/dist/converter/integral7/interface-i7/I7Schema.js.map +0 -1
- package/dist/converter/integral7/interface-i7/db-config.d.ts +0 -13
- package/dist/converter/integral7/interface-i7/db-config.js.map +0 -1
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CoordinateSystem = void 0;
|
|
4
4
|
const __1 = require("../..");
|
|
5
5
|
const utils_1 = require("../../util/utils");
|
|
6
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
7
|
+
const xml_serializer_2 = require("../../util/xml/xml.serializer");
|
|
6
8
|
class CoordinateSystem extends __1.IdentifiedObject {
|
|
7
9
|
constructor(mrid, name, shortName, description, baseIRI) {
|
|
8
10
|
super(mrid, name, shortName, description);
|
|
@@ -22,7 +24,7 @@ class CoordinateSystem extends __1.IdentifiedObject {
|
|
|
22
24
|
const suffixID = this.getSuffixID(profile);
|
|
23
25
|
const prefixUUID = this.getPrefixUUID(suffixID);
|
|
24
26
|
xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
|
|
25
|
-
|
|
27
|
+
xml_serializer_2.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
|
|
26
28
|
this.toCIMXMLAttributes(xmlWriter, profile);
|
|
27
29
|
this.toCIMXMLAssociations(xmlWriter, profile);
|
|
28
30
|
xmlWriter.endElement();
|
|
@@ -31,7 +33,7 @@ class CoordinateSystem extends __1.IdentifiedObject {
|
|
|
31
33
|
toCIMXMLAttributes(xmlWriter, profile) {
|
|
32
34
|
super.toCIMXMLAttributes(xmlWriter, profile);
|
|
33
35
|
if (this.crsUrn) {
|
|
34
|
-
|
|
36
|
+
xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn`, this.crsUrn);
|
|
35
37
|
}
|
|
36
38
|
else {
|
|
37
39
|
xmlWriter.writeComment(`${__1.RDF_XML.CIM_NS_PREFIX}:CoordinateSystem.crsUrn is not defined`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoordinateSystem.js","sourceRoot":"","sources":["../../../src/model/common/CoordinateSystem.ts"],"names":[],"mappings":";;;AAAA,6BAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"CoordinateSystem.js","sourceRoot":"","sources":["../../../src/model/common/CoordinateSystem.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Location = void 0;
|
|
4
4
|
const __1 = require("../..");
|
|
5
5
|
const utils_1 = require("../../util/utils");
|
|
6
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
6
7
|
class Location extends __1.IdentifiedObject {
|
|
7
8
|
constructor(mrid, name, shortName, description, baseIRI) {
|
|
8
9
|
super(mrid, name, shortName, description);
|
|
@@ -34,7 +35,7 @@ class Location extends __1.IdentifiedObject {
|
|
|
34
35
|
const suffixID = this.getSuffixID(profile);
|
|
35
36
|
const prefixUUID = this.getPrefixUUID(suffixID);
|
|
36
37
|
xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
|
|
37
|
-
|
|
38
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
|
|
38
39
|
this.toCIMXMLAttributes(xmlWriter, profile);
|
|
39
40
|
this.toCIMXMLAssociations(xmlWriter, profile);
|
|
40
41
|
xmlWriter.endElement();
|
|
@@ -51,7 +52,7 @@ class Location extends __1.IdentifiedObject {
|
|
|
51
52
|
if (profile === __1.RDF_XML.PROFILE_GL) {
|
|
52
53
|
if (this.coordinateSystem) {
|
|
53
54
|
xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'Location.CoordinateSystem', __1.RDF_XML.CIM_NS_16);
|
|
54
|
-
|
|
55
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.coordinateSystem.mrid}`);
|
|
55
56
|
xmlWriter.endElement();
|
|
56
57
|
}
|
|
57
58
|
else {
|
|
@@ -60,7 +61,7 @@ class Location extends __1.IdentifiedObject {
|
|
|
60
61
|
if (this.powerSystemResources.size > 0) {
|
|
61
62
|
for (const value of this.powerSystemResources.values()) {
|
|
62
63
|
xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'Location.PowerSystemResources', __1.RDF_XML.CIM_NS_16);
|
|
63
|
-
|
|
64
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${value.mrid}`);
|
|
64
65
|
xmlWriter.endElement();
|
|
65
66
|
}
|
|
66
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Location.js","sourceRoot":"","sources":["../../../src/model/common/Location.ts"],"names":[],"mappings":";;;AAAA,6BAAmH;AAEnH,
|
|
1
|
+
{"version":3,"file":"Location.js","sourceRoot":"","sources":["../../../src/model/common/Location.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PositionPoint = void 0;
|
|
4
4
|
const __1 = require("../..");
|
|
5
5
|
const utils_1 = require("../../util/utils");
|
|
6
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
6
7
|
class PositionPoint extends __1.IdentifiedObject {
|
|
7
8
|
constructor(mrid, name, shortName, description, baseIRI) {
|
|
8
9
|
super(mrid, name, shortName, description);
|
|
@@ -44,7 +45,7 @@ class PositionPoint extends __1.IdentifiedObject {
|
|
|
44
45
|
const suffixID = this.getSuffixID(profile);
|
|
45
46
|
const prefixUUID = this.getPrefixUUID(suffixID);
|
|
46
47
|
xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
|
|
47
|
-
|
|
48
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
|
|
48
49
|
this.toCIMXMLAttributes(xmlWriter, profile);
|
|
49
50
|
this.toCIMXMLAssociations(xmlWriter, profile);
|
|
50
51
|
xmlWriter.endElement();
|
|
@@ -53,19 +54,19 @@ class PositionPoint extends __1.IdentifiedObject {
|
|
|
53
54
|
toCIMXMLAttributes(xmlWriter, profile) {
|
|
54
55
|
super.toCIMXMLAttributes(xmlWriter, profile);
|
|
55
56
|
if (this.sequenceNumber) {
|
|
56
|
-
|
|
57
|
+
xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:PositionPoint.sequenceNumber`, this.sequenceNumber);
|
|
57
58
|
}
|
|
58
59
|
else {
|
|
59
60
|
xmlWriter.writeComment(`PositionPoint.sequenceNumber is not defined`);
|
|
60
61
|
}
|
|
61
62
|
if (this.xPosition) {
|
|
62
|
-
|
|
63
|
+
xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:PositionPoint.xPosition`, this.xPosition);
|
|
63
64
|
}
|
|
64
65
|
else {
|
|
65
66
|
xmlWriter.writeComment(`PositionPoint.xPosition is not defined`);
|
|
66
67
|
}
|
|
67
68
|
if (this.yPosition) {
|
|
68
|
-
|
|
69
|
+
xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:PositionPoint.yPosition`, this.yPosition);
|
|
69
70
|
}
|
|
70
71
|
else {
|
|
71
72
|
xmlWriter.writeComment(`PositionPoint.yPosition is not defined`);
|
|
@@ -76,7 +77,7 @@ class PositionPoint extends __1.IdentifiedObject {
|
|
|
76
77
|
if (profile === __1.RDF_XML.PROFILE_GL) {
|
|
77
78
|
if (this.location) {
|
|
78
79
|
xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'PositionPoint.Location', __1.RDF_XML.CIM_NS_16);
|
|
79
|
-
|
|
80
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.location.mrid}`);
|
|
80
81
|
xmlWriter.endElement();
|
|
81
82
|
}
|
|
82
83
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionPoint.js","sourceRoot":"","sources":["../../../src/model/common/PositionPoint.ts"],"names":[],"mappings":";;;AAAA,6BAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"PositionPoint.js","sourceRoot":"","sources":["../../../src/model/common/PositionPoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const utils_1 = require("../../util/utils");
|
|
|
6
6
|
const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
7
7
|
const IdentifiedObject_1 = require("./IdentifiedObject");
|
|
8
8
|
const utils_2 = require("../../converter/integral7/utils");
|
|
9
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
9
10
|
class ACDCTerminal extends IdentifiedObject_1.IdentifiedObject {
|
|
10
11
|
constructor(mrid, name, shortName, description, sequenceNumber) {
|
|
11
12
|
super(mrid, name, shortName, description);
|
|
@@ -22,10 +23,10 @@ class ACDCTerminal extends IdentifiedObject_1.IdentifiedObject {
|
|
|
22
23
|
toCIMXMLAttributes(xmlWriter, profile, logger) {
|
|
23
24
|
super.toCIMXMLAttributes(xmlWriter, profile, logger);
|
|
24
25
|
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
|
|
25
|
-
|
|
26
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ACDCTerminal.sequenceNumber`, this.sequenceNumber);
|
|
26
27
|
}
|
|
27
28
|
else if (profile === rdf_xml_1.RDF_XML.PROFILE_SSH) {
|
|
28
|
-
|
|
29
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:ACDCTerminal.connected`, this.connected);
|
|
29
30
|
}
|
|
30
31
|
}
|
|
31
32
|
resolveAttributesFusekiJSON(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ACDCTerminal.js","sourceRoot":"","sources":["../../../src/model/core/ACDCTerminal.ts"],"names":[],"mappings":";;;AACA,sEAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"ACDCTerminal.js","sourceRoot":"","sources":["../../../src/model/core/ACDCTerminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.BaseVoltage = void 0;
|
|
|
4
4
|
const IdentifiedObject_1 = require("./IdentifiedObject");
|
|
5
5
|
const utils_1 = require("../../util/utils");
|
|
6
6
|
const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
7
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
7
8
|
class BaseVoltage extends IdentifiedObject_1.IdentifiedObject {
|
|
8
9
|
constructor(uuid, name, shortName, description) {
|
|
9
10
|
super(uuid, name, shortName, description);
|
|
@@ -51,11 +52,11 @@ class BaseVoltage extends IdentifiedObject_1.IdentifiedObject {
|
|
|
51
52
|
super.toJSONAssociations();
|
|
52
53
|
}
|
|
53
54
|
toCIMXML(xmlWriter, profile) {
|
|
54
|
-
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
|
|
55
|
+
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_EQ_BD) {
|
|
55
56
|
const suffixID = this.getSuffixID(profile);
|
|
56
57
|
const prefixUUID = this.getPrefixUUID(suffixID);
|
|
57
58
|
xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
|
|
58
|
-
|
|
59
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
|
|
59
60
|
this.toCIMXMLAttributes(xmlWriter, profile);
|
|
60
61
|
this.toCIMXMLAssociations(xmlWriter, profile);
|
|
61
62
|
xmlWriter.endElement();
|
|
@@ -63,8 +64,8 @@ class BaseVoltage extends IdentifiedObject_1.IdentifiedObject {
|
|
|
63
64
|
}
|
|
64
65
|
toCIMXMLAttributes(xmlWriter, profile) {
|
|
65
66
|
super.toCIMXMLAttributes(xmlWriter, profile);
|
|
66
|
-
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
|
|
67
|
-
|
|
67
|
+
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_EQ_BD) {
|
|
68
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.CIM_NS_PREFIX}:BaseVoltage.nominalVoltage`, String(this.nominalVoltage.value));
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
71
|
toCIMXMLAssociations(xmlWriter, profile) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseVoltage.js","sourceRoot":"","sources":["../../../src/model/core/BaseVoltage.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"BaseVoltage.js","sourceRoot":"","sources":["../../../src/model/core/BaseVoltage.ts"],"names":[],"mappings":"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"}
|
package/dist/model/core/Bay.d.ts
CHANGED
|
@@ -24,5 +24,5 @@ export declare class Bay extends EquipmentContainer {
|
|
|
24
24
|
protected toCIMXMLAttributes(xmlWriter: XMLWriter, profile: string): void;
|
|
25
25
|
protected toCIMXMLAssociations(xmlWriter: XMLWriter, profile: string): void;
|
|
26
26
|
toGeoJSON(geoJSON: any, profile: string, schemaSettings: ISchemaSettings, diagramObject?: DiagramObject): any;
|
|
27
|
-
getVoltageLevelUUID(): string;
|
|
27
|
+
getVoltageLevelUUID(): string | undefined;
|
|
28
28
|
}
|
package/dist/model/core/Bay.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.Bay = void 0;
|
|
|
4
4
|
const EquipmentContainer_1 = require("../core/EquipmentContainer");
|
|
5
5
|
const utils_1 = require("../../util/utils");
|
|
6
6
|
const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
7
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
7
8
|
class Bay extends EquipmentContainer_1.EquipmentContainer {
|
|
8
9
|
constructor(uuid, name, shortName, description) {
|
|
9
10
|
super(uuid, name, shortName, description);
|
|
@@ -73,7 +74,7 @@ class Bay extends EquipmentContainer_1.EquipmentContainer {
|
|
|
73
74
|
const suffixID = this.getSuffixID(profile);
|
|
74
75
|
const prefixUUID = this.getPrefixUUID(suffixID);
|
|
75
76
|
xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, rdf_xml_1.RDF_XML.CIM_NS_16);
|
|
76
|
-
|
|
77
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
|
|
77
78
|
this.toCIMXMLAttributes(xmlWriter, profile);
|
|
78
79
|
this.toCIMXMLAssociations(xmlWriter, profile);
|
|
79
80
|
xmlWriter.endElement();
|
|
@@ -85,14 +86,10 @@ class Bay extends EquipmentContainer_1.EquipmentContainer {
|
|
|
85
86
|
toCIMXMLAssociations(xmlWriter, profile) {
|
|
86
87
|
super.toCIMXMLAssociations(xmlWriter, profile);
|
|
87
88
|
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
|
|
88
|
-
|
|
89
|
+
this.voltageLevelUUID = this.getVoltageLevelUUID();
|
|
90
|
+
if (this.voltageLevelUUID) {
|
|
89
91
|
xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'Bay.VoltageLevel', rdf_xml_1.RDF_XML.CIM_NS_16);
|
|
90
|
-
|
|
91
|
-
xmlWriter.endElement();
|
|
92
|
-
}
|
|
93
|
-
else if (this.voltageLevelUUID) {
|
|
94
|
-
xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'Bay.VoltageLevel', rdf_xml_1.RDF_XML.CIM_NS_16);
|
|
95
|
-
utils_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.voltageLevelUUID}`);
|
|
92
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.voltageLevelUUID}`);
|
|
96
93
|
xmlWriter.endElement();
|
|
97
94
|
}
|
|
98
95
|
else {
|
|
@@ -128,13 +125,12 @@ class Bay extends EquipmentContainer_1.EquipmentContainer {
|
|
|
128
125
|
return geoJSON;
|
|
129
126
|
}
|
|
130
127
|
getVoltageLevelUUID() {
|
|
131
|
-
if (this.
|
|
132
|
-
return this.voltageLevelUUID;
|
|
133
|
-
}
|
|
134
|
-
else if (this.voltageLevel) {
|
|
128
|
+
if (this.voltageLevel) {
|
|
135
129
|
return this.voltageLevel.getUUID();
|
|
136
130
|
}
|
|
137
|
-
|
|
131
|
+
else {
|
|
132
|
+
return this.voltageLevelUUID;
|
|
133
|
+
}
|
|
138
134
|
}
|
|
139
135
|
}
|
|
140
136
|
exports.Bay = Bay;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Bay.js","sourceRoot":"","sources":["../../../src/model/core/Bay.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAK9D,
|
|
1
|
+
{"version":3,"file":"Bay.js","sourceRoot":"","sources":["../../../src/model/core/Bay.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.ConductingEquipment = void 0;
|
|
|
4
4
|
const Equipment_1 = require("./Equipment");
|
|
5
5
|
const utils_1 = require("../../util/utils");
|
|
6
6
|
const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
7
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
7
8
|
class ConductingEquipment extends Equipment_1.Equipment {
|
|
8
9
|
constructor(uuid, name, shortName, description, aggregate) {
|
|
9
10
|
super(uuid, name, shortName, description, aggregate);
|
|
@@ -111,7 +112,7 @@ class ConductingEquipment extends Equipment_1.Equipment {
|
|
|
111
112
|
this.baseVoltageUUID = this.baseVoltage ? this.baseVoltage.mrid : this.baseVoltageUUID;
|
|
112
113
|
if (this.baseVoltageUUID) {
|
|
113
114
|
xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'ConductingEquipment.BaseVoltage', rdf_xml_1.RDF_XML.CIM_NS_16);
|
|
114
|
-
|
|
115
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.baseVoltageUUID}`);
|
|
115
116
|
xmlWriter.endElement();
|
|
116
117
|
}
|
|
117
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConductingEquipment.js","sourceRoot":"","sources":["../../../src/model/core/ConductingEquipment.ts"],"names":[],"mappings":";;;AAGA,2CAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"ConductingEquipment.js","sourceRoot":"","sources":["../../../src/model/core/ConductingEquipment.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,10 +10,17 @@ import XMLWriter from 'xml-writer';
|
|
|
10
10
|
import { IIdentifiedObject } from '../..';
|
|
11
11
|
import { IConnectivityNode } from '../../interfaces/model/core/IConnectivityNode';
|
|
12
12
|
export declare class ConnectivityNode extends IdentifiedObject implements IConnectivityNode {
|
|
13
|
-
static sparqlQuery: string;
|
|
14
13
|
connectivityNodeContainer: ConnectivityNodeContainer | undefined;
|
|
15
14
|
connectivityNodeContainerUUID: string | undefined;
|
|
16
15
|
terminals: Map<string, Terminal>;
|
|
16
|
+
boundaryPoint: boolean;
|
|
17
|
+
fromEndIsoCode: string;
|
|
18
|
+
fromEndName: string;
|
|
19
|
+
fromEndNameTso: string;
|
|
20
|
+
toEndIsoCode: string;
|
|
21
|
+
toEndName: string;
|
|
22
|
+
toEndNameTso: string;
|
|
23
|
+
static sparqlQuery: string;
|
|
17
24
|
constructor(uuid?: string, name?: string, shortName?: string, description?: string);
|
|
18
25
|
getBaseVoltage(): BaseVoltage | undefined;
|
|
19
26
|
getVoltageLevel(): VoltageLevel | undefined;
|
|
@@ -6,8 +6,10 @@ const ConnectivityNodeContainer_1 = require("../core/ConnectivityNodeContainer")
|
|
|
6
6
|
const VoltageLevel_1 = require("./VoltageLevel");
|
|
7
7
|
const Bay_1 = require("./Bay");
|
|
8
8
|
const utils_1 = require("../../util/utils");
|
|
9
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
9
10
|
const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
10
11
|
const __1 = require("../..");
|
|
12
|
+
const xml_serializer_2 = require("../../util/xml/xml.serializer");
|
|
11
13
|
class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
|
|
12
14
|
constructor(uuid, name, shortName, description) {
|
|
13
15
|
super(uuid, name, shortName, description);
|
|
@@ -189,11 +191,11 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
|
|
|
189
191
|
return false;
|
|
190
192
|
}
|
|
191
193
|
toCIMXML(xmlWriter, profile) {
|
|
192
|
-
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
|
|
194
|
+
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_EQ_BD) {
|
|
193
195
|
const suffixID = this.getSuffixID(profile);
|
|
194
196
|
const prefixUUID = this.getPrefixUUID(suffixID);
|
|
195
197
|
xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'ConnectivityNode', rdf_xml_1.RDF_XML.CIM_NS_16);
|
|
196
|
-
|
|
198
|
+
xml_serializer_2.writeElementAttribute(xmlWriter, suffixID, `${prefixUUID}${this.mrid}`);
|
|
197
199
|
this.toCIMXMLAttributes(xmlWriter, profile);
|
|
198
200
|
this.toCIMXMLAssociations(xmlWriter, profile);
|
|
199
201
|
xmlWriter.endElement();
|
|
@@ -201,18 +203,27 @@ class ConnectivityNode extends IdentifiedObject_1.IdentifiedObject {
|
|
|
201
203
|
}
|
|
202
204
|
toCIMXMLAttributes(xmlWriter, profile) {
|
|
203
205
|
super.toCIMXMLAttributes(xmlWriter, profile);
|
|
206
|
+
if (!profile || profile === rdf_xml_1.RDF_XML.PROFILE_EQ_BD) {
|
|
207
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.ENTSOE_NS_PREFIX}:ConnectivityNode.boundaryPoint`, this.boundaryPoint);
|
|
208
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.ENTSOE_NS_PREFIX}:ConnectivityNode.fromEndIsoCode`, this.fromEndIsoCode);
|
|
209
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.ENTSOE_NS_PREFIX}:ConnectivityNode.fromEndName`, this.fromEndName);
|
|
210
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.ENTSOE_NS_PREFIX}:ConnectivityNode.fromEndNameTso`, this.fromEndNameTso);
|
|
211
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.ENTSOE_NS_PREFIX}:ConnectivityNode.toEndIsoCode`, this.toEndIsoCode);
|
|
212
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.ENTSOE_NS_PREFIX}:ConnectivityNode.toEndName`, this.toEndName);
|
|
213
|
+
xml_serializer_1.writeElement(xmlWriter, `${rdf_xml_1.RDF_XML.ENTSOE_NS_PREFIX}:ConnectivityNode.toEndNameTso`, this.toEndNameTso);
|
|
214
|
+
}
|
|
204
215
|
}
|
|
205
216
|
toCIMXMLAssociations(xmlWriter, profile) {
|
|
206
217
|
super.toCIMXMLAssociations(xmlWriter, profile);
|
|
207
|
-
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
|
|
218
|
+
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_EQ_BD) {
|
|
208
219
|
if (this.connectivityNodeContainer) {
|
|
209
220
|
xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'ConnectivityNode.ConnectivityNodeContainer', rdf_xml_1.RDF_XML.CIM_NS_16);
|
|
210
|
-
|
|
221
|
+
xml_serializer_2.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.connectivityNodeContainer.mrid}`);
|
|
211
222
|
xmlWriter.endElement();
|
|
212
223
|
}
|
|
213
224
|
else if (this.connectivityNodeContainerUUID) {
|
|
214
225
|
xmlWriter.startElementNS(rdf_xml_1.RDF_XML.CIM_NS_PREFIX, 'ConnectivityNode.ConnectivityNodeContainer', rdf_xml_1.RDF_XML.CIM_NS_16);
|
|
215
|
-
|
|
226
|
+
xml_serializer_2.writeElementAttribute(xmlWriter, rdf_xml_1.RDF_XML.RDF_RESRC, `${rdf_xml_1.RDF_XML.HASH_UNDERSCORE}${this.connectivityNodeContainerUUID}`);
|
|
216
227
|
xmlWriter.endElement();
|
|
217
228
|
}
|
|
218
229
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectivityNode.js","sourceRoot":"","sources":["../../../src/model/core/ConnectivityNode.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ConnectivityNode.js","sourceRoot":"","sources":["../../../src/model/core/ConnectivityNode.ts"],"names":[],"mappings":"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"}
|
package/dist/model/core/Curve.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Curve = void 0;
|
|
4
4
|
const index_1 = require("../../index");
|
|
5
|
-
const
|
|
5
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
6
6
|
class Curve extends index_1.IdentifiedObject {
|
|
7
7
|
constructor(uuid, name, shortName, description) {
|
|
8
8
|
super(uuid, name, shortName, description);
|
|
@@ -13,17 +13,17 @@ class Curve extends index_1.IdentifiedObject {
|
|
|
13
13
|
if (profile === index_1.RDF_XML.PROFILE_EQ) {
|
|
14
14
|
if (profile === index_1.RDF_XML.PROFILE_EQ) {
|
|
15
15
|
xmlWriter.startElementNS(index_1.RDF_XML.CIM_NS_PREFIX, 'Curve.curveStyle', index_1.RDF_XML.CIM_NS_16);
|
|
16
|
-
|
|
16
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, index_1.RDF_XML.RDF_RESRC, `${index_1.RDF_XML.CIM_NS_16}CurveStyle.${this.curveStyle}`);
|
|
17
17
|
xmlWriter.endElement();
|
|
18
18
|
xmlWriter.startElementNS(index_1.RDF_XML.CIM_NS_PREFIX, 'Curve.xUnit', index_1.RDF_XML.CIM_NS_16);
|
|
19
|
-
|
|
19
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, index_1.RDF_XML.RDF_RESRC, `${index_1.RDF_XML.CIM_NS_16}UnitSymbol.${this.xUnit}`);
|
|
20
20
|
xmlWriter.endElement();
|
|
21
21
|
xmlWriter.startElementNS(index_1.RDF_XML.CIM_NS_PREFIX, 'Curve.y1Unit', index_1.RDF_XML.CIM_NS_16);
|
|
22
|
-
|
|
22
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, index_1.RDF_XML.RDF_RESRC, `${index_1.RDF_XML.CIM_NS_16}UnitSymbol.${this.y1Unit}`);
|
|
23
23
|
xmlWriter.endElement();
|
|
24
24
|
if (this.y2Unit) {
|
|
25
25
|
xmlWriter.startElementNS(index_1.RDF_XML.CIM_NS_PREFIX, 'Curve.y2Unit', index_1.RDF_XML.CIM_NS_16);
|
|
26
|
-
|
|
26
|
+
xml_serializer_1.writeElementAttribute(xmlWriter, index_1.RDF_XML.RDF_RESRC, `${index_1.RDF_XML.CIM_NS_16}UnitSymbol.${this.y2Unit}`);
|
|
27
27
|
xmlWriter.endElement();
|
|
28
28
|
}
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Curve.js","sourceRoot":"","sources":["../../../src/model/core/Curve.ts"],"names":[],"mappings":";;;AAAA,uCAA8E;
|
|
1
|
+
{"version":3,"file":"Curve.js","sourceRoot":"","sources":["../../../src/model/core/Curve.ts"],"names":[],"mappings":";;;AAAA,uCAA8E;AAG9E,kEAAsE;AAEtE,MAAa,KAAM,SAAQ,wBAAgB;IASvC,YAAY,IAAa,EAAE,IAAa,EAAE,SAAkB,EAAE,WAAoB;QAC9E,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAH9C,eAAU,GAAgB,EAAE,CAAC;IAI7B,CAAC;IAES,kBAAkB,CAAC,SAAoB,EAAE,OAAe;QAC9D,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAK7C,IAAG,OAAO,KAAK,eAAO,CAAC,UAAU,EAAE;YAE/B,IAAG,OAAO,KAAK,eAAO,CAAC,UAAU,EAAE;gBAE/B,SAAS,CAAC,cAAc,CAAC,eAAO,CAAC,aAAa,EAAE,kBAAkB,EAAE,eAAO,CAAC,SAAS,CAAC,CAAC;gBACvF,sCAAqB,CAAC,SAAS,EAAE,eAAO,CAAC,SAAS,EAAE,GAAG,eAAO,CAAC,SAAS,cAAc,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;gBACzG,SAAS,CAAC,UAAU,EAAE,CAAC;gBAGvB,SAAS,CAAC,cAAc,CAAC,eAAO,CAAC,aAAa,EAAE,aAAa,EAAE,eAAO,CAAC,SAAS,CAAC,CAAC;gBAClF,sCAAqB,CAAC,SAAS,EAAE,eAAO,CAAC,SAAS,EAAE,GAAG,eAAO,CAAC,SAAS,cAAc,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBACpG,SAAS,CAAC,UAAU,EAAE,CAAC;gBAGvB,SAAS,CAAC,cAAc,CAAC,eAAO,CAAC,aAAa,EAAE,cAAc,EAAE,eAAO,CAAC,SAAS,CAAC,CAAC;gBACnF,sCAAqB,CAAC,SAAS,EAAE,eAAO,CAAC,SAAS,EAAE,GAAG,eAAO,CAAC,SAAS,cAAc,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;gBACrG,SAAS,CAAC,UAAU,EAAE,CAAC;gBAGvB,IAAI,IAAI,CAAC,MAAM,EAAE;oBACb,SAAS,CAAC,cAAc,CAAC,eAAO,CAAC,aAAa,EAAE,cAAc,EAAE,eAAO,CAAC,SAAS,CAAC,CAAC;oBACnF,sCAAqB,CAAC,SAAS,EAAE,eAAO,CAAC,SAAS,EAAE,GAAG,eAAO,CAAC,SAAS,cAAc,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;oBACrG,SAAS,CAAC,UAAU,EAAE,CAAC;iBAC1B;aACJ;SACJ;IACL,CAAC;CAEJ;AA/CD,sBA+CC"}
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CurveData = void 0;
|
|
4
4
|
const __1 = require("../..");
|
|
5
|
-
const
|
|
5
|
+
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
6
|
+
const xml_serializer_2 = require("../../util/xml/xml.serializer");
|
|
6
7
|
class CurveData {
|
|
7
8
|
constructor(mrid) {
|
|
8
9
|
this.mrid = mrid;
|
|
@@ -11,27 +12,27 @@ class CurveData {
|
|
|
11
12
|
this.checkMandatoryAttributes(profile);
|
|
12
13
|
if (profile === __1.RDF_XML.PROFILE_EQ) {
|
|
13
14
|
xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, this.constructor.name, __1.RDF_XML.CIM_NS_16);
|
|
14
|
-
|
|
15
|
+
xml_serializer_2.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_ID, `${__1.RDF_XML.UNDERSCORE}${this.mrid}`);
|
|
15
16
|
this.toCIMXMLAttributes(xmlWriter, profile);
|
|
16
17
|
this.toCIMXMLAssociations(xmlWriter, profile);
|
|
17
18
|
xmlWriter.endElement();
|
|
18
19
|
}
|
|
19
20
|
}
|
|
20
21
|
toCIMXMLAttributes(xmlWriter, profile) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:CurveData.xvalue`, this.xvalue);
|
|
23
|
+
xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:CurveData.y1value`, this.y1value);
|
|
24
|
+
xml_serializer_1.writeElement(xmlWriter, `${__1.RDF_XML.CIM_NS_PREFIX}:CurveData.y2value`, this.y2value);
|
|
24
25
|
}
|
|
25
26
|
toCIMXMLAssociations(xmlWriter, profile) {
|
|
26
27
|
if (profile === __1.RDF_XML.PROFILE_EQ) {
|
|
27
28
|
if (this.curve) {
|
|
28
29
|
xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'CurveData.Curve', __1.RDF_XML.CIM_NS_16);
|
|
29
|
-
|
|
30
|
+
xml_serializer_2.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.curve.mrid}`);
|
|
30
31
|
xmlWriter.endElement();
|
|
31
32
|
}
|
|
32
33
|
else if (this.curveUUID) {
|
|
33
34
|
xmlWriter.startElementNS(__1.RDF_XML.CIM_NS_PREFIX, 'CurveData.Curve', __1.RDF_XML.CIM_NS_16);
|
|
34
|
-
|
|
35
|
+
xml_serializer_2.writeElementAttribute(xmlWriter, __1.RDF_XML.RDF_RESRC, `${__1.RDF_XML.HASH_UNDERSCORE}${this.curveUUID}`);
|
|
35
36
|
xmlWriter.endElement();
|
|
36
37
|
}
|
|
37
38
|
else {
|