@enervance/insight-cim-model 0.0.66 → 0.0.68
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.js +10 -17
- package/dist/analysis/analysis-neplan/digi-ons.js.map +1 -1
- package/dist/config/load.confings.js +354 -354
- package/dist/config/load.confings.js.map +1 -1
- package/dist/config/westnetz-neplan/callbacks/cb-connectivitynode.js +2 -3
- package/dist/config/westnetz-neplan/callbacks/cb-connectivitynode.js.map +1 -1
- package/dist/config/westnetz-neplan/callbacks/cb-psr.js +1 -2
- package/dist/config/westnetz-neplan/callbacks/cb-psr.js.map +1 -1
- package/dist/constants/cim-asset-types.js +29 -29
- package/dist/constants/cim-asset-types.js.map +1 -1
- package/dist/constants/cim-class-names.js +181 -181
- package/dist/constants/cim-class-names.js.map +1 -1
- package/dist/constants/cim-constants.js +3 -3
- package/dist/constants/cim-constants.js.map +1 -1
- package/dist/constants/rdf-xml.js +59 -59
- package/dist/constants/rdf-xml.js.map +1 -1
- package/dist/converter/PSDM/ConverterPowerSystemDataModel.js +5 -5
- package/dist/converter/PSDM/ConverterPowerSystemDataModel.js.map +1 -1
- package/dist/converter/integral7/converter.integral7.js +3703 -3867
- package/dist/converter/integral7/converter.integral7.js.map +1 -1
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js +1054 -1082
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
- package/dist/converter/integral7/interface-i7/export-frame-i7.js +70 -62
- package/dist/converter/integral7/interface-i7/export-frame-i7.js.map +1 -1
- package/dist/converter/integral7/model/dl-utils/I7KnotenBeziehung.js +11 -0
- package/dist/converter/integral7/model/dl-utils/I7KnotenBeziehung.js.map +1 -1
- package/dist/converter/integral7/model/dl-utils/QueryObjectSsabNsg.js +22 -0
- package/dist/converter/integral7/model/dl-utils/QueryObjectSsabNsg.js.map +1 -1
- package/dist/converter/integral7/model/dl-utils/constants.js +66 -66
- package/dist/converter/integral7/model/dl-utils/constants.js.map +1 -1
- package/dist/converter/integral7/model/dl-utils/util-functions.js +3 -4
- package/dist/converter/integral7/model/dl-utils/util-functions.js.map +1 -1
- package/dist/converter/integral7/model/integral/BaseClass.js +8 -0
- package/dist/converter/integral7/model/integral/BaseClass.js.map +1 -1
- package/dist/converter/integral7/model/integral/BaseClassNsg.js +7 -0
- package/dist/converter/integral7/model/integral/BaseClassNsg.js.map +1 -1
- package/dist/converter/integral7/model/integral/BaseClassTrafoNsg.js +6 -0
- package/dist/converter/integral7/model/integral/BaseClassTrafoNsg.js.map +1 -1
- package/dist/converter/integral7/model/integral/KnotenSo.js +6 -0
- package/dist/converter/integral7/model/integral/KnotenSo.js.map +1 -1
- package/dist/converter/integral7/model/integral/KnotenSoNsg.js +6 -0
- package/dist/converter/integral7/model/integral/KnotenSoNsg.js.map +1 -1
- package/dist/converter/integral7/model/integral/Laengskupplung.js +6 -0
- package/dist/converter/integral7/model/integral/Laengskupplung.js.map +1 -1
- package/dist/converter/integral7/model/integral/Leitung.js +8 -0
- package/dist/converter/integral7/model/integral/Leitung.js.map +1 -1
- package/dist/converter/integral7/model/integral/LeitungNsg.js +10 -0
- package/dist/converter/integral7/model/integral/LeitungNsg.js.map +1 -1
- package/dist/converter/integral7/model/integral/Point.js +2 -0
- package/dist/converter/integral7/model/integral/Point.js.map +1 -1
- package/dist/converter/integral7/model/integral/Schaltanlage.js +6 -1
- package/dist/converter/integral7/model/integral/Schaltanlage.js.map +1 -1
- package/dist/converter/integral7/model/integral/SchaltanlageNSG.js +8 -1
- package/dist/converter/integral7/model/integral/SchaltanlageNSG.js.map +1 -1
- package/dist/converter/integral7/model/integral/Schaltanlagenabschnitt.js +7 -2
- package/dist/converter/integral7/model/integral/Schaltanlagenabschnitt.js.map +1 -1
- package/dist/converter/integral7/model/integral/SchaltanlagenabschnittNsg.js +8 -0
- package/dist/converter/integral7/model/integral/SchaltanlagenabschnittNsg.js.map +1 -1
- package/dist/converter/integral7/model/integral/Schaltfeld.js +5 -0
- package/dist/converter/integral7/model/integral/Schaltfeld.js.map +1 -1
- package/dist/converter/integral7/model/integral/SchaltfeldNsg.js +17 -0
- package/dist/converter/integral7/model/integral/SchaltfeldNsg.js.map +1 -1
- package/dist/converter/integral7/model/integral/Standort.js +15 -1
- package/dist/converter/integral7/model/integral/Standort.js.map +1 -1
- package/dist/converter/integral7/model/integral/StandortNsg.js +4 -1
- package/dist/converter/integral7/model/integral/StandortNsg.js.map +1 -1
- package/dist/converter/integral7/model/integral/Trafo2w.js +6 -0
- package/dist/converter/integral7/model/integral/Trafo2w.js.map +1 -1
- package/dist/converter/integral7/model/integral/Trafo2wNsg.js +5 -0
- package/dist/converter/integral7/model/integral/Trafo2wNsg.js.map +1 -1
- package/dist/converter/integral7/model/integral/Trafo3w.js +5 -0
- package/dist/converter/integral7/model/integral/Trafo3w.js.map +1 -1
- package/dist/converter/integral7/model/integral/Trafo3wNsg.js +12 -0
- package/dist/converter/integral7/model/integral/Trafo3wNsg.js.map +1 -1
- package/dist/converter/integral7/sql/integral.sql.js +253 -253
- package/dist/converter/integral7/sql/integral.sql.js.map +1 -1
- package/dist/converter/integral7/utils-schema.js +1 -2
- package/dist/converter/integral7/utils-schema.js.map +1 -1
- package/dist/converter/integral7/utils.js +27 -33
- package/dist/converter/integral7/utils.js.map +1 -1
- package/dist/data-structures/Settings.js +4 -0
- package/dist/data-structures/Settings.js.map +1 -1
- package/dist/data-structures/graph/GraphObject.js +8 -3
- package/dist/data-structures/graph/GraphObject.js.map +1 -1
- package/dist/data-structures/graph/connections/connection.js +5 -1
- package/dist/data-structures/graph/connections/connection.js.map +1 -1
- package/dist/data-structures/graph/edges/GraphEdge.js +2 -0
- package/dist/data-structures/graph/edges/GraphEdge.js.map +1 -1
- package/dist/data-structures/graph/graph.js +4 -3
- package/dist/data-structures/graph/graph.js.map +1 -1
- package/dist/data-structures/tree/GraphTree.js +10 -12
- package/dist/data-structures/tree/GraphTree.js.map +1 -1
- package/dist/data-structures/tree/GraphTreeEdge.js +6 -3
- package/dist/data-structures/tree/GraphTreeEdge.js.map +1 -1
- package/dist/data-structures/tree/GraphTreeNode.js +11 -11
- package/dist/data-structures/tree/GraphTreeNode.js.map +1 -1
- package/dist/data-structures/tree/GraphTreeObject.js +6 -2
- package/dist/data-structures/tree/GraphTreeObject.js.map +1 -1
- package/dist/etl/etl-neplan/etl-neplan-csv.js +18 -23
- package/dist/etl/etl-neplan/etl-neplan-csv.js.map +1 -1
- package/dist/etl/etl-neplan/etl-neplan-feederline.js +6 -7
- package/dist/etl/etl-neplan/etl-neplan-feederline.js.map +1 -1
- package/dist/etl/etl-neplan/etl-neplan-geo.js +26 -34
- package/dist/etl/etl-neplan/etl-neplan-geo.js.map +1 -1
- package/dist/etl/etl-neplan/etl-neplan-util.js +5 -7
- package/dist/etl/etl-neplan/etl-neplan-util.js.map +1 -1
- package/dist/etl/etl-neplan/etl-neplan.js +19 -23
- package/dist/etl/etl-neplan/etl-neplan.js.map +1 -1
- package/dist/etl/etl-neplan/neplan-contingency-analysis.js +6 -7
- package/dist/etl/etl-neplan/neplan-contingency-analysis.js.map +1 -1
- package/dist/etl/etl-psdm-novagent/etl-psdm-novagent-energytypes.js +2 -2
- package/dist/etl/etl-psdm-novagent/etl-psdm-novagent-energytypes.js.map +1 -1
- package/dist/grid-validation/grid-validation.js +3 -4
- package/dist/grid-validation/grid-validation.js.map +1 -1
- package/dist/interfaces/schema-settings/ShapeInfos.js +12 -0
- package/dist/interfaces/schema-settings/ShapeInfos.js.map +1 -1
- package/dist/model/alternate-models/AlternateModel.js +2 -0
- package/dist/model/alternate-models/AlternateModel.js.map +1 -1
- package/dist/model/alternate-models/AlternateModelGroup.js +1 -1
- package/dist/model/alternate-models/AlternateModelGroup.js.map +1 -1
- package/dist/model/assetinfo/AssetInfo.js +5 -5
- package/dist/model/assetinfo/AssetInfo.js.map +1 -1
- package/dist/model/assetinfo/SwitchInfo.js +21 -22
- package/dist/model/assetinfo/SwitchInfo.js.map +1 -1
- package/dist/model/assetinfo/TapChangerInfo.js +68 -36
- package/dist/model/assetinfo/TapChangerInfo.js.map +1 -1
- package/dist/model/assetinfo/TransformerEndInfo.js +8 -3
- package/dist/model/assetinfo/TransformerEndInfo.js.map +1 -1
- package/dist/model/assetinfo/WireInfo.js +3 -0
- package/dist/model/assetinfo/WireInfo.js.map +1 -1
- package/dist/model/assets/AggregateScore.js +23 -24
- package/dist/model/assets/AggregateScore.js.map +1 -1
- package/dist/model/assets/Analytic.js +31 -28
- package/dist/model/assets/Analytic.js.map +1 -1
- package/dist/model/assets/AnalyticScore.js +5 -0
- package/dist/model/assets/AnalyticScore.js.map +1 -1
- package/dist/model/assets/Asset.js +53 -46
- package/dist/model/assets/Asset.js.map +1 -1
- package/dist/model/assets/AssetContainer.js +2 -2
- package/dist/model/assets/AssetContainer.js.map +1 -1
- package/dist/model/assets/AssetDeployment.js +31 -25
- package/dist/model/assets/AssetDeployment.js.map +1 -1
- package/dist/model/assets/AssetHealthEvent.js +27 -28
- package/dist/model/assets/AssetHealthEvent.js.map +1 -1
- package/dist/model/assets/AssetOrganisationRole.js +2 -2
- package/dist/model/assets/AssetOrganisationRole.js.map +1 -1
- package/dist/model/assets/AssetOwner.js +19 -20
- package/dist/model/assets/AssetOwner.js.map +1 -1
- package/dist/model/assets/AssetUser.js +19 -20
- package/dist/model/assets/AssetUser.js.map +1 -1
- package/dist/model/assets/DeploymentDate.js +5 -0
- package/dist/model/assets/DeploymentDate.js.map +1 -1
- package/dist/model/assets/Facility.js +22 -22
- package/dist/model/assets/Facility.js.map +1 -1
- package/dist/model/assets/HealthScore.js +22 -23
- package/dist/model/assets/HealthScore.js.map +1 -1
- package/dist/model/assets/LifecycleDate.js +6 -0
- package/dist/model/assets/LifecycleDate.js.map +1 -1
- package/dist/model/assets/Structure.js +1 -0
- package/dist/model/assets/Structure.js.map +1 -1
- package/dist/model/common/ActivityRecord.js +6 -1
- package/dist/model/common/ActivityRecord.js.map +1 -1
- package/dist/model/common/CoordinateSystem.js +18 -18
- package/dist/model/common/CoordinateSystem.js.map +1 -1
- package/dist/model/common/Document.js +1 -0
- package/dist/model/common/Document.js.map +1 -1
- package/dist/model/common/Location.js +33 -31
- package/dist/model/common/Location.js.map +1 -1
- package/dist/model/common/Organisation.js +21 -22
- package/dist/model/common/Organisation.js.map +1 -1
- package/dist/model/common/OrganisationRole.js +3 -2
- package/dist/model/common/OrganisationRole.js.map +1 -1
- package/dist/model/common/PositionPoint.js +32 -27
- package/dist/model/common/PositionPoint.js.map +1 -1
- package/dist/model/common/Status.js +4 -0
- package/dist/model/common/Status.js.map +1 -1
- package/dist/model/core/ACDCTerminal.js +3 -1
- package/dist/model/core/ACDCTerminal.js.map +1 -1
- package/dist/model/core/BaseVoltage.js +26 -26
- package/dist/model/core/BaseVoltage.js.map +1 -1
- package/dist/model/core/Bay.js +27 -27
- package/dist/model/core/Bay.js.map +1 -1
- package/dist/model/core/ConductingEquipment.js +8 -1
- package/dist/model/core/ConductingEquipment.js.map +1 -1
- package/dist/model/core/ConnectivityNode.js +41 -32
- package/dist/model/core/ConnectivityNode.js.map +1 -1
- package/dist/model/core/ConnectivityNodeContainer.js +2 -0
- package/dist/model/core/ConnectivityNodeContainer.js.map +1 -1
- package/dist/model/core/Curve.js +5 -1
- package/dist/model/core/Curve.js.map +1 -1
- package/dist/model/core/CurveData.js +6 -0
- package/dist/model/core/CurveData.js.map +1 -1
- package/dist/model/core/Equipment.js +7 -0
- package/dist/model/core/Equipment.js.map +1 -1
- package/dist/model/core/EquipmentContainer.js +3 -1
- package/dist/model/core/EquipmentContainer.js.map +1 -1
- package/dist/model/core/Feeder.js +13 -8
- package/dist/model/core/Feeder.js.map +1 -1
- package/dist/model/core/GeographicalRegion.js +1 -1
- package/dist/model/core/GeographicalRegion.js.map +1 -1
- package/dist/model/core/IdentifiedObject.js +32 -9
- package/dist/model/core/IdentifiedObject.js.map +1 -1
- package/dist/model/core/PSRType.js +33 -19
- package/dist/model/core/PSRType.js.map +1 -1
- package/dist/model/core/PowerSystemResource.js +10 -5
- package/dist/model/core/PowerSystemResource.js.map +1 -1
- package/dist/model/core/SubGeographicalRegion.js +3 -2
- package/dist/model/core/SubGeographicalRegion.js.map +1 -1
- package/dist/model/core/Substation.js +37 -31
- package/dist/model/core/Substation.js.map +1 -1
- package/dist/model/core/Terminal.js +56 -38
- package/dist/model/core/Terminal.js.map +1 -1
- package/dist/model/core/VoltageLevel.js +29 -23
- package/dist/model/core/VoltageLevel.js.map +1 -1
- package/dist/model/dc/ACDCConverter.js +28 -4
- package/dist/model/dc/ACDCConverter.js.map +1 -1
- package/dist/model/dc/ACDCConverterDCTerminal.js +3 -0
- package/dist/model/dc/ACDCConverterDCTerminal.js.map +1 -1
- package/dist/model/dc/CsConverter.js +20 -0
- package/dist/model/dc/CsConverter.js.map +1 -1
- package/dist/model/dc/DCBaseTerminal.js +2 -0
- package/dist/model/dc/DCBaseTerminal.js.map +1 -1
- package/dist/model/dc/DCConductingEquipment.js +1 -4
- package/dist/model/dc/DCConductingEquipment.js.map +1 -1
- package/dist/model/dc/DCConverterUnit.js +3 -0
- package/dist/model/dc/DCConverterUnit.js.map +1 -1
- package/dist/model/dc/DCEquipmentContainer.js +1 -4
- package/dist/model/dc/DCEquipmentContainer.js.map +1 -1
- package/dist/model/dc/DCLine.js +20 -18
- package/dist/model/dc/DCLine.js.map +1 -1
- package/dist/model/dc/DCLineSegment.js +34 -26
- package/dist/model/dc/DCLineSegment.js.map +1 -1
- package/dist/model/dc/DCNode.js +4 -2
- package/dist/model/dc/DCNode.js.map +1 -1
- package/dist/model/dc/DCTerminal.js +2 -0
- package/dist/model/dc/DCTerminal.js.map +1 -1
- package/dist/model/dc/VsConverter.js +11 -0
- package/dist/model/dc/VsConverter.js.map +1 -1
- package/dist/model/diagram/Diagram.js +29 -24
- package/dist/model/diagram/Diagram.js.map +1 -1
- package/dist/model/diagram/DiagramObject.js +34 -28
- package/dist/model/diagram/DiagramObject.js.map +1 -1
- package/dist/model/diagram/DiagramObjectPoint.js +52 -48
- package/dist/model/diagram/DiagramObjectPoint.js.map +1 -1
- package/dist/model/diagram/DiagramStyle.js +1 -1
- package/dist/model/diagram/DiagramStyle.js.map +1 -1
- package/dist/model/domain/ActivePower.js +3 -0
- package/dist/model/domain/ActivePower.js.map +1 -1
- package/dist/model/domain/AngleDegrees.js +3 -0
- package/dist/model/domain/AngleDegrees.js.map +1 -1
- package/dist/model/domain/ApparentPower.js +3 -0
- package/dist/model/domain/ApparentPower.js.map +1 -1
- package/dist/model/domain/Capacitance.js +3 -0
- package/dist/model/domain/Capacitance.js.map +1 -1
- package/dist/model/domain/CapacitancePerLength.js +3 -0
- package/dist/model/domain/CapacitancePerLength.js.map +1 -1
- package/dist/model/domain/ConductancePerLength.js +3 -0
- package/dist/model/domain/ConductancePerLength.js.map +1 -1
- package/dist/model/domain/CurrentFlow.js +3 -0
- package/dist/model/domain/CurrentFlow.js.map +1 -1
- package/dist/model/domain/Reactance.js +3 -0
- package/dist/model/domain/Reactance.js.map +1 -1
- package/dist/model/domain/ReactancePerLength.js +3 -0
- package/dist/model/domain/ReactancePerLength.js.map +1 -1
- package/dist/model/domain/ReactivePower.js +3 -0
- package/dist/model/domain/ReactivePower.js.map +1 -1
- package/dist/model/domain/Resistance.js +3 -0
- package/dist/model/domain/Resistance.js.map +1 -1
- package/dist/model/domain/ResistancePerLength.js +3 -0
- package/dist/model/domain/ResistancePerLength.js.map +1 -1
- package/dist/model/domain/Voltage.js +3 -0
- package/dist/model/domain/Voltage.js.map +1 -1
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/DynamicsFunctionBlock.js +1 -0
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/DynamicsFunctionBlock.js.map +1 -1
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/RotatingMachineDynamics.js +6 -0
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/RotatingMachineDynamics.js.map +1 -1
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineDetailed.js +4 -0
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineDetailed.js.map +1 -1
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineDynamics.js +1 -0
- 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 +74 -0
- package/dist/model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineTimeConstantReactance.js.map +1 -1
- package/dist/model/equivalents/EquivalentBranch.js +62 -47
- package/dist/model/equivalents/EquivalentBranch.js.map +1 -1
- package/dist/model/equivalents/EquivalentInjection.js +15 -0
- package/dist/model/equivalents/EquivalentInjection.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONAssetCommunicationEquipment.js +19 -20
- package/dist/model/extensions/amprion/assets/AMPRIONAssetCommunicationEquipment.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONAssetConstructionMaintenance.js +19 -20
- package/dist/model/extensions/amprion/assets/AMPRIONAssetConstructionMaintenance.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONAssetPrimaryEquipment.js +19 -20
- package/dist/model/extensions/amprion/assets/AMPRIONAssetPrimaryEquipment.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONAssetSecondaryEquipment.js +19 -20
- package/dist/model/extensions/amprion/assets/AMPRIONAssetSecondaryEquipment.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONConstructionContainer.js +17 -8
- package/dist/model/extensions/amprion/assets/AMPRIONConstructionContainer.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONContractingAuthority.js +19 -20
- package/dist/model/extensions/amprion/assets/AMPRIONContractingAuthority.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONCountry.js +23 -24
- package/dist/model/extensions/amprion/assets/AMPRIONCountry.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONFacility.js +23 -6
- package/dist/model/extensions/amprion/assets/AMPRIONFacility.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONLeaseholder.js +19 -20
- package/dist/model/extensions/amprion/assets/AMPRIONLeaseholder.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONLineDistrict.js +19 -20
- package/dist/model/extensions/amprion/assets/AMPRIONLineDistrict.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONServiceProvider.js +19 -20
- package/dist/model/extensions/amprion/assets/AMPRIONServiceProvider.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONSpanField.js +21 -6
- package/dist/model/extensions/amprion/assets/AMPRIONSpanField.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONState.js +27 -27
- package/dist/model/extensions/amprion/assets/AMPRIONState.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONTeam.js +19 -20
- package/dist/model/extensions/amprion/assets/AMPRIONTeam.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONTower.js +28 -11
- package/dist/model/extensions/amprion/assets/AMPRIONTower.js.map +1 -1
- package/dist/model/extensions/amprion/assets/AMPRIONWire.js +30 -6
- package/dist/model/extensions/amprion/assets/AMPRIONWire.js.map +1 -1
- package/dist/model/extensions/amprion/core/AMPRIONBay.js +6 -5
- package/dist/model/extensions/amprion/core/AMPRIONBay.js.map +1 -1
- package/dist/model/extensions/amprion/core/AMPRIONConnectivityNode.js +2 -0
- package/dist/model/extensions/amprion/core/AMPRIONConnectivityNode.js.map +1 -1
- package/dist/model/extensions/amprion/core/AMPRIONLine.js +7 -6
- package/dist/model/extensions/amprion/core/AMPRIONLine.js.map +1 -1
- package/dist/model/extensions/amprion/core/AMPRIONSubstation.js +8 -6
- package/dist/model/extensions/amprion/core/AMPRIONSubstation.js.map +1 -1
- package/dist/model/extensions/amprion/operationallimits/AMPRIONMaxInstrumentalCurrentLimit.js +19 -20
- package/dist/model/extensions/amprion/operationallimits/AMPRIONMaxInstrumentalCurrentLimit.js.map +1 -1
- package/dist/model/extensions/amprion/operationallimits/AMPRIONProtectionCurrentLimit.js +19 -20
- package/dist/model/extensions/amprion/operationallimits/AMPRIONProtectionCurrentLimit.js.map +1 -1
- package/dist/model/extensions/amprion/operationallimits/AMPRIONThermalConnectionCurrentLimit.js +19 -20
- package/dist/model/extensions/amprion/operationallimits/AMPRIONThermalConnectionCurrentLimit.js.map +1 -1
- package/dist/model/extensions/amprion/operationallimits/AMPRIONThermalCurrentLimit.js +19 -20
- package/dist/model/extensions/amprion/operationallimits/AMPRIONThermalCurrentLimit.js.map +1 -1
- package/dist/model/extensions/amprion/project/AMPRIONConstructionProject.js +30 -9
- package/dist/model/extensions/amprion/project/AMPRIONConstructionProject.js.map +1 -1
- package/dist/model/extensions/amprion/project/AMPRIONConstructionProjectBundle.js +9 -8
- package/dist/model/extensions/amprion/project/AMPRIONConstructionProjectBundle.js.map +1 -1
- package/dist/model/extensions/amprion/project/AMPRIONConstructionProjectPlan.js +6 -7
- package/dist/model/extensions/amprion/project/AMPRIONConstructionProjectPlan.js.map +1 -1
- package/dist/model/extensions/amprion/project/AMPRIONErpProject.js +2 -0
- package/dist/model/extensions/amprion/project/AMPRIONErpProject.js.map +1 -1
- package/dist/model/extensions/amprion/project/AMPRIONErpProjectPhase.js +13 -7
- package/dist/model/extensions/amprion/project/AMPRIONErpProjectPhase.js.map +1 -1
- package/dist/model/extensions/amprion/project/AMPRIONErpProjectStructure.js +8 -1
- package/dist/model/extensions/amprion/project/AMPRIONErpProjectStructure.js.map +1 -1
- package/dist/model/extensions/amprion/wires/AMPRIONACLineSegment.js +8 -8
- package/dist/model/extensions/amprion/wires/AMPRIONACLineSegment.js.map +1 -1
- package/dist/model/extensions/amprion/wires/AMPRIONACLineSubSegment.js +37 -35
- package/dist/model/extensions/amprion/wires/AMPRIONACLineSubSegment.js.map +1 -1
- package/dist/model/extensions/amprion/wires/AMPRIONSeriesCompensator.js +1 -0
- package/dist/model/extensions/amprion/wires/AMPRIONSeriesCompensator.js.map +1 -1
- package/dist/model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo.js +45 -35
- package/dist/model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo.js.map +1 -1
- package/dist/model/extensions/enervance/assetinfo/EVPowerTransformerInfo.js +42 -25
- package/dist/model/extensions/enervance/assetinfo/EVPowerTransformerInfo.js.map +1 -1
- package/dist/model/extensions/enervance/assetinfo/EVStationInfo.js +33 -26
- package/dist/model/extensions/enervance/assetinfo/EVStationInfo.js.map +1 -1
- package/dist/model/extensions/enervance/assetinfo/EVTapChangerInfo.js +24 -22
- package/dist/model/extensions/enervance/assetinfo/EVTapChangerInfo.js.map +1 -1
- package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js +54 -39
- package/dist/model/extensions/enervance/assetinfo/EVWireInfo.js.map +1 -1
- package/dist/model/extensions/enervance/assets/EVAnalytic.js +15 -15
- package/dist/model/extensions/enervance/assets/EVAnalytic.js.map +1 -1
- package/dist/model/extensions/enervance/assets/EVImportanceScore.js +22 -23
- package/dist/model/extensions/enervance/assets/EVImportanceScore.js.map +1 -1
- package/dist/model/extensions/enervance/assets/EVIndicator.js +24 -24
- package/dist/model/extensions/enervance/assets/EVIndicator.js.map +1 -1
- package/dist/model/extensions/enervance/assets/EVWireObject.js +47 -47
- package/dist/model/extensions/enervance/assets/EVWireObject.js.map +1 -1
- package/dist/model/extensions/enervance/core/EVTerminal.js +5 -5
- package/dist/model/extensions/enervance/core/EVTerminal.js.map +1 -1
- package/dist/model/extensions/enervance/generic-data-set/EVMetaObject.js +38 -26
- package/dist/model/extensions/enervance/generic-data-set/EVMetaObject.js.map +1 -1
- package/dist/model/extensions/enervance/operations/EVTerminalAction.js +19 -17
- package/dist/model/extensions/enervance/operations/EVTerminalAction.js.map +1 -1
- package/dist/model/extensions/enervance/wires/EVACLineSegment.js +41 -42
- package/dist/model/extensions/enervance/wires/EVACLineSegment.js.map +1 -1
- package/dist/model/extensions/enervance/wires/EVACLineSubSegment.js +36 -35
- package/dist/model/extensions/enervance/wires/EVACLineSubSegment.js.map +1 -1
- package/dist/model/extensions/integral/common/INTEGRALMultiplierFactor.js +5 -0
- package/dist/model/extensions/integral/common/INTEGRALMultiplierFactor.js.map +1 -1
- package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js +2 -0
- package/dist/model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js.map +1 -1
- package/dist/model/extensions/integral/loadmodel/INTEGRALConformLoad.js +3 -0
- package/dist/model/extensions/integral/loadmodel/INTEGRALConformLoad.js.map +1 -1
- package/dist/model/extensions/integral/wires/INTEGRALACLineSegment.js +1 -0
- package/dist/model/extensions/integral/wires/INTEGRALACLineSegment.js.map +1 -1
- package/dist/model/extensions/integral/wires/INTEGRALAsynchronousMachine.js +4 -0
- package/dist/model/extensions/integral/wires/INTEGRALAsynchronousMachine.js.map +1 -1
- package/dist/model/extensions/integral/wires/INTEGRALExternalNetworkInjection.js +4 -0
- package/dist/model/extensions/integral/wires/INTEGRALExternalNetworkInjection.js.map +1 -1
- package/dist/model/extensions/integral/wires/INTEGRALSynchronousMachine.js +4 -0
- package/dist/model/extensions/integral/wires/INTEGRALSynchronousMachine.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/assets/WNFacility.js +7 -7
- package/dist/model/extensions/neplan-westnetz/assets/WNFacility.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/assets/WNFacilityKind.js +1 -2
- package/dist/model/extensions/neplan-westnetz/assets/WNFacilityKind.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/assets/WNWireInfo.js +41 -38
- package/dist/model/extensions/neplan-westnetz/assets/WNWireInfo.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/assets/WNZUWOHealthScore.js +5 -5
- package/dist/model/extensions/neplan-westnetz/assets/WNZUWOHealthScore.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/assets/WNZUWOImportanceScore.js +5 -5
- package/dist/model/extensions/neplan-westnetz/assets/WNZUWOImportanceScore.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/assets/WNZUWOPriority.js +5 -5
- package/dist/model/extensions/neplan-westnetz/assets/WNZUWOPriority.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/common/WNLocation.js +29 -28
- package/dist/model/extensions/neplan-westnetz/common/WNLocation.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/core/WNBay.js +32 -30
- package/dist/model/extensions/neplan-westnetz/core/WNBay.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/core/WNConnectivityNode.js +62 -55
- package/dist/model/extensions/neplan-westnetz/core/WNConnectivityNode.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/core/WNFeeder.js +33 -28
- package/dist/model/extensions/neplan-westnetz/core/WNFeeder.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/faults/WNFaultConnectivityNode.js +18 -17
- package/dist/model/extensions/neplan-westnetz/faults/WNFaultConnectivityNode.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/operations/WNOutage.js +14 -12
- package/dist/model/extensions/neplan-westnetz/operations/WNOutage.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/wires/WNACLineSegment.js +50 -47
- package/dist/model/extensions/neplan-westnetz/wires/WNACLineSegment.js.map +1 -1
- package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.js +139 -95
- package/dist/model/extensions/neplan-westnetz/wires/WNEnergyConsumer.js.map +1 -1
- package/dist/model/faults/Fault.js +2 -0
- package/dist/model/faults/Fault.js.map +1 -1
- package/dist/model/generation/FossilFuel.js +2 -0
- package/dist/model/generation/FossilFuel.js.map +1 -1
- package/dist/model/generation/GeneratingUnit.js +55 -41
- package/dist/model/generation/GeneratingUnit.js.map +1 -1
- package/dist/model/generation/HydroGeneratingUnit.js +2 -0
- package/dist/model/generation/HydroGeneratingUnit.js.map +1 -1
- package/dist/model/generation/HydroPowerPlant.js +2 -2
- package/dist/model/generation/HydroPowerPlant.js.map +1 -1
- package/dist/model/generation/HydroPump.js +2 -0
- package/dist/model/generation/HydroPump.js.map +1 -1
- package/dist/model/generation/ThermalGeneratingUnit.js +1 -1
- package/dist/model/generation/ThermalGeneratingUnit.js.map +1 -1
- package/dist/model/generation/WindGeneratingUnit.js +12 -11
- package/dist/model/generation/WindGeneratingUnit.js.map +1 -1
- package/dist/model/generic-data-set/ChangeSet.js +25 -26
- package/dist/model/generic-data-set/ChangeSet.js.map +1 -1
- package/dist/model/generic-data-set/ChangeSetMember.js +19 -5
- package/dist/model/generic-data-set/ChangeSetMember.js.map +1 -1
- package/dist/model/generic-data-set/DataSet.js +9 -0
- package/dist/model/generic-data-set/DataSet.js.map +1 -1
- package/dist/model/generic-data-set/InstanceSet.js +2 -2
- package/dist/model/generic-data-set/InstanceSet.js.map +1 -1
- package/dist/model/generic-data-set/ObjectCreation.js +25 -26
- package/dist/model/generic-data-set/ObjectCreation.js.map +1 -1
- package/dist/model/generic-data-set/ObjectDeletion.js +25 -26
- package/dist/model/generic-data-set/ObjectDeletion.js.map +1 -1
- package/dist/model/generic-data-set/ObjectModification.js +30 -30
- package/dist/model/generic-data-set/ObjectModification.js.map +1 -1
- package/dist/model/generic-data-set/ObjectReverseModification.js +26 -26
- package/dist/model/generic-data-set/ObjectReverseModification.js.map +1 -1
- package/dist/model/loadmodel/ConformLoad.js +5 -3
- package/dist/model/loadmodel/ConformLoad.js.map +1 -1
- package/dist/model/loadmodel/ConformLoadGroup.js +3 -3
- package/dist/model/loadmodel/ConformLoadGroup.js.map +1 -1
- package/dist/model/loadmodel/LoadArea.js +4 -4
- package/dist/model/loadmodel/LoadArea.js.map +1 -1
- package/dist/model/loadmodel/LoadGroup.js +2 -0
- package/dist/model/loadmodel/LoadGroup.js.map +1 -1
- package/dist/model/loadmodel/SubLoadArea.js +6 -4
- package/dist/model/loadmodel/SubLoadArea.js.map +1 -1
- package/dist/model/meas/Analog.js +4 -0
- package/dist/model/meas/Analog.js.map +1 -1
- package/dist/model/meas/Measurement.js +4 -0
- package/dist/model/meas/Measurement.js.map +1 -1
- package/dist/model/model-description/FullModel.js +1 -2
- package/dist/model/model-description/FullModel.js.map +1 -1
- package/dist/model/model-description/Model.js +36 -30
- package/dist/model/model-description/Model.js.map +1 -1
- package/dist/model/model-operations/DatasetArg.js +1 -0
- package/dist/model/model-operations/DatasetArg.js.map +1 -1
- package/dist/model/model-operations/IncrementalDatasetArg.js +30 -27
- package/dist/model/model-operations/IncrementalDatasetArg.js.map +1 -1
- package/dist/model/model-operations/IncrementalDatasetArgDescription.js +22 -23
- package/dist/model/model-operations/IncrementalDatasetArgDescription.js.map +1 -1
- package/dist/model/model-operations/ModelOperation.js +26 -24
- package/dist/model/model-operations/ModelOperation.js.map +1 -1
- package/dist/model/model-operations/ModelOperationArg.js +3 -0
- package/dist/model/model-operations/ModelOperationArg.js.map +1 -1
- package/dist/model/model-operations/ModelOperationArgDescription.js +4 -0
- package/dist/model/model-operations/ModelOperationArgDescription.js.map +1 -1
- package/dist/model/model-operations/ModelOperationDescription.js +23 -24
- package/dist/model/model-operations/ModelOperationDescription.js.map +1 -1
- package/dist/model/operationallimits/CurrentLimit.js +22 -22
- package/dist/model/operationallimits/CurrentLimit.js.map +1 -1
- package/dist/model/operationallimits/OperationalLimit.js +4 -0
- package/dist/model/operationallimits/OperationalLimit.js.map +1 -1
- package/dist/model/operationallimits/OperationalLimitSet.js +25 -21
- package/dist/model/operationallimits/OperationalLimitSet.js.map +1 -1
- package/dist/model/operationallimits/OperationalLimitType.js +22 -19
- package/dist/model/operationallimits/OperationalLimitType.js.map +1 -1
- package/dist/model/operationallimits/VoltageLimit.js +2 -0
- package/dist/model/operationallimits/VoltageLimit.js.map +1 -1
- package/dist/model/operations/ControlArea.js +1 -4
- package/dist/model/operations/ControlArea.js.map +1 -1
- package/dist/model/operations/Outage.js +7 -0
- package/dist/model/operations/Outage.js.map +1 -1
- package/dist/model/operations/SwitchAction.js +17 -15
- package/dist/model/operations/SwitchAction.js.map +1 -1
- package/dist/model/operations/SwitchingAction.js +2 -0
- package/dist/model/operations/SwitchingAction.js.map +1 -1
- package/dist/model/operations/SwitchingPlan.js +18 -5
- package/dist/model/operations/SwitchingPlan.js.map +1 -1
- package/dist/model/statevariables/StateVariable.js +1 -0
- package/dist/model/statevariables/StateVariable.js.map +1 -1
- package/dist/model/statevariables/SvPowerFlow.js +27 -24
- package/dist/model/statevariables/SvPowerFlow.js.map +1 -1
- package/dist/model/statevariables/SvStatus.js +3 -1
- package/dist/model/statevariables/SvStatus.js.map +1 -1
- package/dist/model/statevariables/SvTapStep.js +3 -0
- package/dist/model/statevariables/SvTapStep.js.map +1 -1
- package/dist/model/statevariables/SvVoltage.js +26 -23
- package/dist/model/statevariables/SvVoltage.js.map +1 -1
- package/dist/model/topology/TopologicalIsland.js +22 -20
- package/dist/model/topology/TopologicalIsland.js.map +1 -1
- package/dist/model/topology/TopologicalNode.js +36 -29
- package/dist/model/topology/TopologicalNode.js.map +1 -1
- package/dist/model/wires/ACLineSegment.js +51 -44
- package/dist/model/wires/ACLineSegment.js.map +1 -1
- package/dist/model/wires/AsynchronousMachine.js +10 -0
- package/dist/model/wires/AsynchronousMachine.js.map +1 -1
- package/dist/model/wires/Breaker.js +34 -35
- package/dist/model/wires/Breaker.js.map +1 -1
- package/dist/model/wires/BusbarSection.js +24 -24
- package/dist/model/wires/BusbarSection.js.map +1 -1
- package/dist/model/wires/Clamp.js +9 -9
- package/dist/model/wires/Clamp.js.map +1 -1
- package/dist/model/wires/CompositeSwitch.js +1 -0
- package/dist/model/wires/CompositeSwitch.js.map +1 -1
- package/dist/model/wires/Conductor.js +1 -0
- package/dist/model/wires/Conductor.js.map +1 -1
- package/dist/model/wires/Disconnector.js +33 -34
- package/dist/model/wires/Disconnector.js.map +1 -1
- package/dist/model/wires/EarthFaultCompensator.js +1 -0
- package/dist/model/wires/EarthFaultCompensator.js.map +1 -1
- package/dist/model/wires/EnergyConsumer.js +43 -35
- package/dist/model/wires/EnergyConsumer.js.map +1 -1
- package/dist/model/wires/EnergySource.js +16 -5
- package/dist/model/wires/EnergySource.js.map +1 -1
- package/dist/model/wires/ExternalNetworkInjection.js +67 -51
- package/dist/model/wires/ExternalNetworkInjection.js.map +1 -1
- package/dist/model/wires/Ground.js +13 -13
- package/dist/model/wires/Ground.js.map +1 -1
- package/dist/model/wires/GroundDisconnector.js +13 -13
- package/dist/model/wires/GroundDisconnector.js.map +1 -1
- package/dist/model/wires/GroundingImpedance.js +1 -0
- package/dist/model/wires/GroundingImpedance.js.map +1 -1
- package/dist/model/wires/Junction.js +22 -23
- package/dist/model/wires/Junction.js.map +1 -1
- package/dist/model/wires/Line.js +29 -29
- package/dist/model/wires/Line.js.map +1 -1
- package/dist/model/wires/LinearShuntCompensator.js +7 -3
- package/dist/model/wires/LinearShuntCompensator.js.map +1 -1
- package/dist/model/wires/LoadBreakSwitch.js +33 -34
- package/dist/model/wires/LoadBreakSwitch.js.map +1 -1
- package/dist/model/wires/PetersenCoil.js +37 -31
- package/dist/model/wires/PetersenCoil.js.map +1 -1
- package/dist/model/wires/PhaseTapChanger.js +2 -0
- package/dist/model/wires/PhaseTapChanger.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerAsymmetrical.js +1 -0
- package/dist/model/wires/PhaseTapChangerAsymmetrical.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerLinear.js +3 -0
- package/dist/model/wires/PhaseTapChangerLinear.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerNonLinear.js +3 -0
- package/dist/model/wires/PhaseTapChangerNonLinear.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerTable.js +2 -1
- package/dist/model/wires/PhaseTapChangerTable.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerTablePoint.js +3 -0
- package/dist/model/wires/PhaseTapChangerTablePoint.js.map +1 -1
- package/dist/model/wires/PhaseTapChangerTabular.js +2 -0
- package/dist/model/wires/PhaseTapChangerTabular.js.map +1 -1
- package/dist/model/wires/Plant.js +1 -1
- package/dist/model/wires/Plant.js.map +1 -1
- package/dist/model/wires/PowerTransformer.js +34 -36
- package/dist/model/wires/PowerTransformer.js.map +1 -1
- package/dist/model/wires/PowerTransformerEnd.js +47 -45
- package/dist/model/wires/PowerTransformerEnd.js.map +1 -1
- package/dist/model/wires/RatioTapChanger.js +6 -0
- package/dist/model/wires/RatioTapChanger.js.map +1 -1
- package/dist/model/wires/RatioTapChangerTable.js +2 -1
- package/dist/model/wires/RatioTapChangerTable.js.map +1 -1
- package/dist/model/wires/RatioTapChangerTablePoint.js +2 -0
- package/dist/model/wires/RatioTapChangerTablePoint.js.map +1 -1
- package/dist/model/wires/ReactiveCapabilityCurve.js +1 -1
- package/dist/model/wires/ReactiveCapabilityCurve.js.map +1 -1
- package/dist/model/wires/Recloser.js +9 -9
- package/dist/model/wires/Recloser.js.map +1 -1
- package/dist/model/wires/RegulatingCondEq.js +3 -0
- package/dist/model/wires/RegulatingCondEq.js.map +1 -1
- package/dist/model/wires/RegulatingControl.js +43 -34
- package/dist/model/wires/RegulatingControl.js.map +1 -1
- package/dist/model/wires/RotatingMachine.js +8 -0
- package/dist/model/wires/RotatingMachine.js.map +1 -1
- package/dist/model/wires/SeriesCompensator.js +45 -39
- package/dist/model/wires/SeriesCompensator.js.map +1 -1
- package/dist/model/wires/ShuntCompensator.js +9 -0
- package/dist/model/wires/ShuntCompensator.js.map +1 -1
- package/dist/model/wires/StaticVarCompensator.js +6 -0
- package/dist/model/wires/StaticVarCompensator.js.map +1 -1
- package/dist/model/wires/Switch.js +46 -43
- package/dist/model/wires/Switch.js.map +1 -1
- package/dist/model/wires/SynchronousMachine.js +85 -60
- package/dist/model/wires/SynchronousMachine.js.map +1 -1
- package/dist/model/wires/TapChanger.js +14 -0
- package/dist/model/wires/TapChanger.js.map +1 -1
- package/dist/model/wires/TapChangerControl.js +1 -1
- package/dist/model/wires/TapChangerControl.js.map +1 -1
- package/dist/model/wires/TapChangerTablePoint.js +7 -0
- package/dist/model/wires/TapChangerTablePoint.js.map +1 -1
- package/dist/model/wires/TransformerEnd.js +12 -0
- package/dist/model/wires/TransformerEnd.js.map +1 -1
- package/dist/model-container/model/AMPRIONModelContainer.js +24 -24
- package/dist/model-container/model/AMPRIONModelContainer.js.map +1 -1
- package/dist/model-container/model/EVModelsContainer.js +48 -33
- package/dist/model-container/model/EVModelsContainer.js.map +1 -1
- package/dist/model-container/model/INTEGRALModelContainer.js +3 -4
- package/dist/model-container/model/INTEGRALModelContainer.js.map +1 -1
- package/dist/model-container/model/ModelContainer.js +186 -185
- package/dist/model-container/model/ModelContainer.js.map +1 -1
- package/dist/model-container/model/WNModelContainer.js +1 -4
- package/dist/model-container/model/WNModelContainer.js.map +1 -1
- package/dist/rdf/RdfBase.js +5 -1
- package/dist/rdf/RdfBase.js.map +1 -1
- package/dist/rdf/RdfClass.js +28 -32
- package/dist/rdf/RdfClass.js.map +1 -1
- package/dist/rdf/RdfEnum.js +29 -27
- package/dist/rdf/RdfEnum.js.map +1 -1
- package/dist/rdf/RdfModel.js +5 -8
- package/dist/rdf/RdfModel.js.map +1 -1
- package/dist/rdf/RdfProperty.js +43 -35
- package/dist/rdf/RdfProperty.js.map +1 -1
- package/dist/util/collection/util-excel.js +1 -2
- package/dist/util/collection/util-excel.js.map +1 -1
- package/dist/util/collection/util-graph2tree.js +11 -15
- package/dist/util/collection/util-graph2tree.js.map +1 -1
- package/dist/util/database/mysql-controller.js +7 -9
- package/dist/util/database/mysql-controller.js.map +1 -1
- package/dist/util/sparql/sparql-utils.js +9 -9
- package/dist/util/sparql/sparql-utils.js.map +1 -1
- package/dist/util/util-test.js +116 -135
- package/dist/util/util-test.js.map +1 -1
- package/dist/util/utils.js +7 -10
- package/dist/util/utils.js.map +1 -1
- package/dist/util/xml/xml.parser.js +6 -0
- package/dist/util/xml/xml.parser.js.map +1 -1
- package/dist/util/xml/xml.serializer.js +2 -0
- package/dist/util/xml/xml.serializer.js.map +1 -1
- package/dist/utils2/cim.model.utils.js +45 -54
- package/dist/utils2/cim.model.utils.js.map +1 -1
- package/dist/utils2/common.utils.js +3 -3
- package/dist/utils2/common.utils.js.map +1 -1
- package/dist/utils2/fuseki.utils.js +16 -27
- package/dist/utils2/fuseki.utils.js.map +1 -1
- package/dist/utils2/import.utils.js +25 -30
- package/dist/utils2/import.utils.js.map +1 -1
- package/dist/utils2/model.modification.utils.js +16 -12
- package/dist/utils2/model.modification.utils.js.map +1 -1
- package/dist/utils2/parser.utils.js +1 -1
- package/dist/utils2/parser.utils.js.map +1 -1
- package/dist/utils2/rdf.model.utils.js +11 -15
- package/dist/utils2/rdf.model.utils.js.map +1 -1
- package/dist/utils2/sparql.utils.js +17 -18
- package/dist/utils2/sparql.utils.js.map +1 -1
- package/package.json +6 -8
|
@@ -5,6 +5,15 @@ const EquipmentContainer_1 = require("../core/EquipmentContainer");
|
|
|
5
5
|
const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
6
6
|
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
7
7
|
class Substation extends EquipmentContainer_1.EquipmentContainer {
|
|
8
|
+
subGeographicalRegion;
|
|
9
|
+
subGeographicalRegionUUID;
|
|
10
|
+
voltageLevels;
|
|
11
|
+
bays;
|
|
12
|
+
dcConverterUnit;
|
|
13
|
+
/** The feeders that potentially energize the downstream substation. */
|
|
14
|
+
normalEnergizingFeeder;
|
|
15
|
+
/** The normal energized feeders of the substation. */
|
|
16
|
+
normalEnergizedFeeder;
|
|
8
17
|
constructor(uuid, name, shortName, description, baseIRI) {
|
|
9
18
|
super(uuid, name, shortName, description, baseIRI);
|
|
10
19
|
this.voltageLevels = [];
|
|
@@ -25,6 +34,30 @@ class Substation extends EquipmentContainer_1.EquipmentContainer {
|
|
|
25
34
|
addDCConverterUnit(dcConverterUnit) {
|
|
26
35
|
this.dcConverterUnit.set(dcConverterUnit.mrid, dcConverterUnit);
|
|
27
36
|
}
|
|
37
|
+
static sparqlQuery = `
|
|
38
|
+
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
39
|
+
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
40
|
+
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
41
|
+
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
42
|
+
PREFIX amp: <http://amprion.net/CIM/Extensions#>
|
|
43
|
+
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
44
|
+
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
45
|
+
|
|
46
|
+
SELECT (strafter(strafter(str(?sUUID), "#"), "_") AS ?uuid)
|
|
47
|
+
(CONCAT(STRBEFORE(str(?sUUID), '#_'), '#_') AS ?baseIRI)
|
|
48
|
+
?name ?shortName ?description
|
|
49
|
+
|
|
50
|
+
WHERE {
|
|
51
|
+
GRAPH <http://default/>{
|
|
52
|
+
|
|
53
|
+
?sUUID rdf:type cim:Substation .
|
|
54
|
+
OPTIONAL{?sUUID cim:IdentifiedObject.name ?name .}
|
|
55
|
+
OPTIONAL{?sUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
56
|
+
OPTIONAL{?sUUID cim:IdentifiedObject.description ?description .}
|
|
57
|
+
OPTIONAL { ?mrid cim:PowerSystemResource.Location ?lUUID . }
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
`;
|
|
28
61
|
static getQuerySPARQL(graphURI) {
|
|
29
62
|
if (graphURI.length > 0) {
|
|
30
63
|
return Substation.sparqlQuery.replace("<http://default/>", graphURI);
|
|
@@ -32,8 +65,7 @@ class Substation extends EquipmentContainer_1.EquipmentContainer {
|
|
|
32
65
|
return Substation.sparqlQuery;
|
|
33
66
|
}
|
|
34
67
|
static resolveClassFusekiJSON(data, cimModel) {
|
|
35
|
-
|
|
36
|
-
(_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
|
|
68
|
+
data?.results?.bindings?.forEach((value) => {
|
|
37
69
|
const substation = new Substation();
|
|
38
70
|
substation.resolveAttributesFusekiJSON(value);
|
|
39
71
|
cimModel.addSubstation(substation);
|
|
@@ -92,11 +124,10 @@ class Substation extends EquipmentContainer_1.EquipmentContainer {
|
|
|
92
124
|
/** Erstellt ein GeoJSON-Objekt für die Karte */
|
|
93
125
|
// TODO überarbeiten und konsolidieren mit Schema
|
|
94
126
|
toMapGeoJSON() {
|
|
95
|
-
var _a, _b, _c, _d;
|
|
96
127
|
const geoJSON = {};
|
|
97
|
-
if (
|
|
128
|
+
if (this.location?.positionPoints?.length) {
|
|
98
129
|
const points = [];
|
|
99
|
-
|
|
130
|
+
this.location?.positionPoints?.forEach((point) => {
|
|
100
131
|
if (+point.xPosition > 0 && +point.yPosition > 0) {
|
|
101
132
|
points.push(+point.xPosition);
|
|
102
133
|
points.push(+point.yPosition);
|
|
@@ -120,7 +151,6 @@ class Substation extends EquipmentContainer_1.EquipmentContainer {
|
|
|
120
151
|
return geoJSON;
|
|
121
152
|
}
|
|
122
153
|
toGeoJSON(geoJSON, profile, schemaSettings, diagramObject) {
|
|
123
|
-
var _a;
|
|
124
154
|
const coordinates = diagramObject.computeRectBounds(diagramObject);
|
|
125
155
|
const shapeInfos = schemaSettings.getRectangleShapeInfo(profile);
|
|
126
156
|
let x = coordinates[0];
|
|
@@ -131,7 +161,7 @@ class Substation extends EquipmentContainer_1.EquipmentContainer {
|
|
|
131
161
|
let height = coordinates[3];
|
|
132
162
|
/* Shape besteht nur aus einer Koordinate */
|
|
133
163
|
if (shapeInfos && width === 1 && height === 1) {
|
|
134
|
-
width =
|
|
164
|
+
width = +shapeInfos.width ?? 0;
|
|
135
165
|
height = +shapeInfos.height;
|
|
136
166
|
offsetX = +width / 2;
|
|
137
167
|
offsetY = +height / 2;
|
|
@@ -248,28 +278,4 @@ class Substation extends EquipmentContainer_1.EquipmentContainer {
|
|
|
248
278
|
}
|
|
249
279
|
}
|
|
250
280
|
exports.Substation = Substation;
|
|
251
|
-
Substation.sparqlQuery = `
|
|
252
|
-
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
253
|
-
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
254
|
-
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
255
|
-
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
256
|
-
PREFIX amp: <http://amprion.net/CIM/Extensions#>
|
|
257
|
-
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
258
|
-
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
259
|
-
|
|
260
|
-
SELECT (strafter(strafter(str(?sUUID), "#"), "_") AS ?uuid)
|
|
261
|
-
(CONCAT(STRBEFORE(str(?sUUID), '#_'), '#_') AS ?baseIRI)
|
|
262
|
-
?name ?shortName ?description
|
|
263
|
-
|
|
264
|
-
WHERE {
|
|
265
|
-
GRAPH <http://default/>{
|
|
266
|
-
|
|
267
|
-
?sUUID rdf:type cim:Substation .
|
|
268
|
-
OPTIONAL{?sUUID cim:IdentifiedObject.name ?name .}
|
|
269
|
-
OPTIONAL{?sUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
270
|
-
OPTIONAL{?sUUID cim:IdentifiedObject.description ?description .}
|
|
271
|
-
OPTIONAL { ?mrid cim:PowerSystemResource.Location ?lUUID . }
|
|
272
|
-
}
|
|
273
|
-
}
|
|
274
|
-
`;
|
|
275
281
|
//# sourceMappingURL=Substation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Substation.js","sourceRoot":"","sources":["../../../src/model/core/Substation.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAKhE,qDAAkD;AAKlD,kEAAsE;AAGtE,MAAa,UAAW,SAAQ,uCAAkB;
|
|
1
|
+
{"version":3,"file":"Substation.js","sourceRoot":"","sources":["../../../src/model/core/Substation.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,25 @@ const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
|
7
7
|
const PhaseCode_1 = require("./PhaseCode");
|
|
8
8
|
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
9
9
|
class Terminal extends ACDCTerminal_1.ACDCTerminal {
|
|
10
|
+
connectivityNode;
|
|
11
|
+
connectivityNodeUUID;
|
|
12
|
+
conductingEquipment;
|
|
13
|
+
conductingEquipmentUUID;
|
|
14
|
+
topologicalNode;
|
|
15
|
+
topologicalNodeUUID;
|
|
16
|
+
operationalLimitSets;
|
|
17
|
+
phases;
|
|
18
|
+
transformerEnds;
|
|
19
|
+
svPowerFlow;
|
|
20
|
+
regulatingControl;
|
|
21
|
+
/** DC Model */
|
|
22
|
+
/** Point of common coupling terminal for this converter DC side.
|
|
23
|
+
* It is typically the terminal on the power transformer (or switch) closest to the AC network.
|
|
24
|
+
* The power flow measurement must be the sum of all flows into the transformer.*/
|
|
25
|
+
converterDCSides;
|
|
26
|
+
/** The feeder that this terminal normally feeds. Only specified for the terminals at head of feeders.*/
|
|
27
|
+
normalHeadFeeder;
|
|
28
|
+
normalHeadFeederUUID;
|
|
10
29
|
constructor(mrid, name, shortName, description, sequenceNumber) {
|
|
11
30
|
super(mrid, name, shortName, description, sequenceNumber);
|
|
12
31
|
this.transformerEnds = [];
|
|
@@ -104,9 +123,40 @@ class Terminal extends ACDCTerminal_1.ACDCTerminal {
|
|
|
104
123
|
setTopologicalNode(value) {
|
|
105
124
|
this.topologicalNode = value;
|
|
106
125
|
}
|
|
126
|
+
static sparqlQuery = `
|
|
127
|
+
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
128
|
+
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
129
|
+
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
130
|
+
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
131
|
+
PREFIX amp: <http://amprion.net/CIM/Extensions#>
|
|
132
|
+
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
133
|
+
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
134
|
+
|
|
135
|
+
SELECT (strafter(strafter(str(?terminalUUID), '#'), '_') AS ?uuid)
|
|
136
|
+
(CONCAT(STRBEFORE(STR(?terminalUUID), '#_'), '#_') AS ?baseIRI)
|
|
137
|
+
?name ?shortName ?connected ?sequenceNumber ?phases
|
|
138
|
+
(strafter(strafter(str(?cnUUID), '#'), '_') AS ?connectivityNodeUUID)
|
|
139
|
+
(strafter(strafter(str(?ceUUID), '#'), '_') AS ?conductingEquipmentUUID)
|
|
140
|
+
(strafter(strafter(str(?tpUUID), '#'), '_') AS ?topologicalNodeUUID)
|
|
141
|
+
(strafter(strafter(str(?nhFeederUUID), '#'), '_') AS ?normalHeadFeederUUID)
|
|
142
|
+
|
|
143
|
+
WHERE {
|
|
144
|
+
GRAPH <http://default/>{
|
|
145
|
+
?terminalUUID rdf:type cim:Terminal .
|
|
146
|
+
OPTIONAL {?terminalUUID cim:IdentifiedObject.name ?name .}
|
|
147
|
+
OPTIONAL {?terminalUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
148
|
+
OPTIONAL {?terminalUUID cim:ACDCTerminal.connected ?connected .}
|
|
149
|
+
OPTIONAL {?terminalUUID cim:ACDCTerminal.sequenceNumber ?sequenceNumber .}
|
|
150
|
+
OPTIONAL {?terminalUUID cim:Terminal.phases ?phases .}
|
|
151
|
+
OPTIONAL {?terminalUUID cim:Terminal.ConnectivityNode ?cnUUID .}
|
|
152
|
+
OPTIONAL {?terminalUUID cim:Terminal.ConductingEquipment ?ceUUID .}
|
|
153
|
+
OPTIONAL {?terminalUUID cim:Terminal.TopologicalNode ?tpUUID .}
|
|
154
|
+
OPTIONAL {?terminalUUID cim:Terminal.NormalHeadFeeder ?nhFeederUUID .}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
`;
|
|
107
158
|
static resolveClassFusekiJSON(data, cimModel) {
|
|
108
|
-
|
|
109
|
-
(_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
|
|
159
|
+
data?.results?.bindings?.forEach((value) => {
|
|
110
160
|
const newClass = new Terminal();
|
|
111
161
|
newClass.resolveAttributesFusekiJSON(value);
|
|
112
162
|
cimModel.addTerminal(newClass);
|
|
@@ -262,7 +312,7 @@ class Terminal extends ACDCTerminal_1.ACDCTerminal {
|
|
|
262
312
|
/** CIM RDF/XML Serialisierung */
|
|
263
313
|
toCIMXML(xmlWriter, profile, logger) {
|
|
264
314
|
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ || profile === rdf_xml_1.RDF_XML.PROFILE_SSH || profile === rdf_xml_1.RDF_XML.PROFILE_TP || profile === rdf_xml_1.RDF_XML.PROFILE_EQ_BD) {
|
|
265
|
-
logger
|
|
315
|
+
logger?.addTerminal(this.mrid, profile);
|
|
266
316
|
// logger?.warn(`${this.mrid};Terminal;${profile}`);
|
|
267
317
|
const suffixID = this.getSuffixID(profile);
|
|
268
318
|
const prefixUUID = this.getPrefixUUID(suffixID);
|
|
@@ -292,7 +342,7 @@ class Terminal extends ACDCTerminal_1.ACDCTerminal {
|
|
|
292
342
|
}
|
|
293
343
|
else {
|
|
294
344
|
xmlWriter.writeComment('ConductingEquipment is not defined');
|
|
295
|
-
logger
|
|
345
|
+
logger?.info(`${this.mrid};Terminal;ConductingEquipment is not defined`);
|
|
296
346
|
}
|
|
297
347
|
this.connectivityNodeUUID = this.connectivityNode ? this.connectivityNode.mrid : this.connectivityNodeUUID;
|
|
298
348
|
if (this.connectivityNodeUUID) {
|
|
@@ -302,7 +352,7 @@ class Terminal extends ACDCTerminal_1.ACDCTerminal {
|
|
|
302
352
|
}
|
|
303
353
|
else {
|
|
304
354
|
xmlWriter.writeComment('ConnectivityNode is not defined');
|
|
305
|
-
logger
|
|
355
|
+
logger?.info(`${this.mrid};Terminal;ConnectivityNode is not defined`);
|
|
306
356
|
}
|
|
307
357
|
}
|
|
308
358
|
if (profile === rdf_xml_1.RDF_XML.PROFILE_TP) {
|
|
@@ -315,7 +365,7 @@ class Terminal extends ACDCTerminal_1.ACDCTerminal {
|
|
|
315
365
|
}
|
|
316
366
|
else {
|
|
317
367
|
xmlWriter.writeComment('TopologicalNode is not defined');
|
|
318
|
-
logger
|
|
368
|
+
logger?.info(`${this.mrid};Terminal;TopologicalNode is not defined`);
|
|
319
369
|
}
|
|
320
370
|
}
|
|
321
371
|
}
|
|
@@ -372,36 +422,4 @@ class Terminal extends ACDCTerminal_1.ACDCTerminal {
|
|
|
372
422
|
}
|
|
373
423
|
}
|
|
374
424
|
exports.Terminal = Terminal;
|
|
375
|
-
Terminal.sparqlQuery = `
|
|
376
|
-
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
377
|
-
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
378
|
-
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
379
|
-
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
380
|
-
PREFIX amp: <http://amprion.net/CIM/Extensions#>
|
|
381
|
-
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
382
|
-
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
383
|
-
|
|
384
|
-
SELECT (strafter(strafter(str(?terminalUUID), '#'), '_') AS ?uuid)
|
|
385
|
-
(CONCAT(STRBEFORE(STR(?terminalUUID), '#_'), '#_') AS ?baseIRI)
|
|
386
|
-
?name ?shortName ?connected ?sequenceNumber ?phases
|
|
387
|
-
(strafter(strafter(str(?cnUUID), '#'), '_') AS ?connectivityNodeUUID)
|
|
388
|
-
(strafter(strafter(str(?ceUUID), '#'), '_') AS ?conductingEquipmentUUID)
|
|
389
|
-
(strafter(strafter(str(?tpUUID), '#'), '_') AS ?topologicalNodeUUID)
|
|
390
|
-
(strafter(strafter(str(?nhFeederUUID), '#'), '_') AS ?normalHeadFeederUUID)
|
|
391
|
-
|
|
392
|
-
WHERE {
|
|
393
|
-
GRAPH <http://default/>{
|
|
394
|
-
?terminalUUID rdf:type cim:Terminal .
|
|
395
|
-
OPTIONAL {?terminalUUID cim:IdentifiedObject.name ?name .}
|
|
396
|
-
OPTIONAL {?terminalUUID entsoe:IdentifiedObject.shortName ?shortName .}
|
|
397
|
-
OPTIONAL {?terminalUUID cim:ACDCTerminal.connected ?connected .}
|
|
398
|
-
OPTIONAL {?terminalUUID cim:ACDCTerminal.sequenceNumber ?sequenceNumber .}
|
|
399
|
-
OPTIONAL {?terminalUUID cim:Terminal.phases ?phases .}
|
|
400
|
-
OPTIONAL {?terminalUUID cim:Terminal.ConnectivityNode ?cnUUID .}
|
|
401
|
-
OPTIONAL {?terminalUUID cim:Terminal.ConductingEquipment ?ceUUID .}
|
|
402
|
-
OPTIONAL {?terminalUUID cim:Terminal.TopologicalNode ?tpUUID .}
|
|
403
|
-
OPTIONAL {?terminalUUID cim:Terminal.NormalHeadFeeder ?nhFeederUUID .}
|
|
404
|
-
}
|
|
405
|
-
}
|
|
406
|
-
`;
|
|
407
425
|
//# sourceMappingURL=Terminal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../src/model/core/Terminal.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../src/model/core/Terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,13 @@ const utils_1 = require("../../util/utils");
|
|
|
7
7
|
const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
8
8
|
const xml_serializer_2 = require("../../util/xml/xml.serializer");
|
|
9
9
|
class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
|
|
10
|
+
substation;
|
|
11
|
+
substationUUID;
|
|
12
|
+
baseVoltage;
|
|
13
|
+
baseVoltageUUID;
|
|
14
|
+
bays;
|
|
15
|
+
highVoltageLimit;
|
|
16
|
+
lowVoltageLimit;
|
|
10
17
|
constructor(uuid, name, shortName, description, baseIRI) {
|
|
11
18
|
super(uuid, name, shortName, description, baseIRI);
|
|
12
19
|
this.bays = [];
|
|
@@ -35,6 +42,27 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
|
|
|
35
42
|
addBay(bay) {
|
|
36
43
|
this.bays.push(bay);
|
|
37
44
|
}
|
|
45
|
+
static sparqlQuery = `
|
|
46
|
+
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
47
|
+
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
48
|
+
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
49
|
+
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
50
|
+
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
51
|
+
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
52
|
+
|
|
53
|
+
SELECT (STRAFTER(str(?vlUUID), '#_') AS ?uuid)
|
|
54
|
+
(CONCAT(STRBEFORE(str(?vlUUID), '#_'), '#_') AS ?baseIRI)
|
|
55
|
+
?name (STRAFTER(str(?sUUID), '#_') AS ?substationUUID) (STRAFTER(str(?bvUUID), '#_') AS ?baseVoltageUUID)
|
|
56
|
+
|
|
57
|
+
WHERE {
|
|
58
|
+
GRAPH <http://default/>{
|
|
59
|
+
OPTIONAL{?vlUUID rdf:type cim:VoltageLevel .}
|
|
60
|
+
OPTIONAL{?vlUUID cim:IdentifiedObject.name ?name .}
|
|
61
|
+
OPTIONAL{?vlUUID cim:VoltageLevel.Substation ?sUUID .}
|
|
62
|
+
OPTIONAL{?vlUUID cim:VoltageLevel.BaseVoltage ?bvUUID .}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
`;
|
|
38
66
|
static getQuerySPARQL(graphURI) {
|
|
39
67
|
if (graphURI.length > 0) {
|
|
40
68
|
return VoltageLevel.sparqlQuery.replace('<http://default/>', graphURI);
|
|
@@ -42,8 +70,7 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
|
|
|
42
70
|
return VoltageLevel.sparqlQuery;
|
|
43
71
|
}
|
|
44
72
|
static resolveClassFusekiJSON(data, cimModel) {
|
|
45
|
-
|
|
46
|
-
(_b = (_a = data === null || data === void 0 ? void 0 : data.results) === null || _a === void 0 ? void 0 : _a.bindings) === null || _b === void 0 ? void 0 : _b.forEach((value) => {
|
|
73
|
+
data?.results?.bindings?.forEach((value) => {
|
|
47
74
|
const voltageLevel = new VoltageLevel();
|
|
48
75
|
voltageLevel.resolveAttributesFusekiJSON(value);
|
|
49
76
|
cimModel.addVoltageLevel(voltageLevel);
|
|
@@ -142,25 +169,4 @@ class VoltageLevel extends EquipmentContainer_1.EquipmentContainer {
|
|
|
142
169
|
}
|
|
143
170
|
}
|
|
144
171
|
exports.VoltageLevel = VoltageLevel;
|
|
145
|
-
VoltageLevel.sparqlQuery = `
|
|
146
|
-
PREFIX cim: <http://iec.ch/TC57/2013/CIM-schema-cim16#>
|
|
147
|
-
PREFIX enervance: <http://enervance.com/CIM/Extensions#>
|
|
148
|
-
PREFIX entsoe: <http://entsoe.eu/CIM/SchemaExtension/3/1#>
|
|
149
|
-
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
|
150
|
-
PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
|
|
151
|
-
PREFIX afn: <http://jena.apache.org/ARQ/function#>
|
|
152
|
-
|
|
153
|
-
SELECT (STRAFTER(str(?vlUUID), '#_') AS ?uuid)
|
|
154
|
-
(CONCAT(STRBEFORE(str(?vlUUID), '#_'), '#_') AS ?baseIRI)
|
|
155
|
-
?name (STRAFTER(str(?sUUID), '#_') AS ?substationUUID) (STRAFTER(str(?bvUUID), '#_') AS ?baseVoltageUUID)
|
|
156
|
-
|
|
157
|
-
WHERE {
|
|
158
|
-
GRAPH <http://default/>{
|
|
159
|
-
OPTIONAL{?vlUUID rdf:type cim:VoltageLevel .}
|
|
160
|
-
OPTIONAL{?vlUUID cim:IdentifiedObject.name ?name .}
|
|
161
|
-
OPTIONAL{?vlUUID cim:VoltageLevel.Substation ?sUUID .}
|
|
162
|
-
OPTIONAL{?vlUUID cim:VoltageLevel.BaseVoltage ?bvUUID .}
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
`;
|
|
166
172
|
//# sourceMappingURL=VoltageLevel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VoltageLevel.js","sourceRoot":"","sources":["../../../src/model/core/VoltageLevel.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAG9D,kEAA6D;AAG7D,4CAA0C;AAE1C,qDAAgD;AAChD,kEAAsE;AAEtE,MAAa,YAAa,SAAQ,uCAAkB;
|
|
1
|
+
{"version":3,"file":"VoltageLevel.js","sourceRoot":"","sources":["../../../src/model/core/VoltageLevel.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,34 @@ const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
|
6
6
|
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
7
7
|
const utils_1 = require("../../converter/integral7/utils");
|
|
8
8
|
class ACDCConverter extends ConductingEquipment_1.ConductingEquipment {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
/** Base apparent power of the converter pole */
|
|
10
|
+
baseS;
|
|
11
|
+
/** Active power loss in pole at no power transfer. Converter configuration data used in power flow. */
|
|
12
|
+
idleLoss;
|
|
13
|
+
/** The maximum voltage on the DC side at which the converter should operate. Converter configuration data used in power flow.*/
|
|
14
|
+
maxUdc;
|
|
15
|
+
/** Min allowed converter DC voltage. Converter configuration data used in power flow. */
|
|
16
|
+
minUdc;
|
|
17
|
+
/** Number of valves in the converter. Used in loss calculations. */
|
|
18
|
+
numberOfValves;
|
|
19
|
+
/** Rated converter DC voltage, also called UdN. Converter configuration data used in power flow. */
|
|
20
|
+
ratedUdc;
|
|
21
|
+
/** Converter configuration data used in power flow. Refer to poleLossP. */
|
|
22
|
+
resistiveLoss;
|
|
23
|
+
/** Switching losses, relative to the base apparent power 'baseS'.
|
|
24
|
+
Refer to poleLossP.*/
|
|
25
|
+
switchingLoss;
|
|
26
|
+
/** Valve threshold voltage. Forward voltage drop when the valve is conducting. Used in loss calculations, i.e. the switchLoss depend on numberOfValves * valveU0. */
|
|
27
|
+
valveU0;
|
|
28
|
+
/** All converters' DC sides linked to this point of common coupling terminal.*/
|
|
29
|
+
pccTerminal;
|
|
30
|
+
pccTerminalUUID;
|
|
31
|
+
dCTerminals = new Map();
|
|
32
|
+
//SSH Profil
|
|
33
|
+
p; //ActivePower mandatory
|
|
34
|
+
q; //ReactivePower mandatory
|
|
35
|
+
targetPpcc; //ActivePower mandatory
|
|
36
|
+
targetUdc; //Voltage mandatory
|
|
13
37
|
toCIMXMLAttributes(xmlWriter, profile) {
|
|
14
38
|
super.toCIMXMLAttributes(xmlWriter, profile);
|
|
15
39
|
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ACDCConverter.js","sourceRoot":"","sources":["../../../src/model/dc/ACDCConverter.ts"],"names":[],"mappings":";;;AAAA,qEAAkE;AAGlE,qDAAkD;AAClD,kEAAoF;AAGpF,2DAA8D;AAE9D,MAAa,aAAc,SAAQ,yCAAmB;
|
|
1
|
+
{"version":3,"file":"ACDCConverter.js","sourceRoot":"","sources":["../../../src/model/dc/ACDCConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,9 @@ const DCBaseTerminal_1 = require("./DCBaseTerminal");
|
|
|
5
5
|
const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
6
6
|
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
7
7
|
class ACDCConverterDCTerminal extends DCBaseTerminal_1.DCBaseTerminal {
|
|
8
|
+
polarity;
|
|
9
|
+
dCConductingEquipment; // mandatory
|
|
10
|
+
dCConductingEquipmentUUID;
|
|
8
11
|
constructor(uuid, name, shortName, description) {
|
|
9
12
|
super(uuid, name, shortName, description);
|
|
10
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ACDCConverterDCTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/ACDCConverterDCTerminal.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAGhD,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,uBAAwB,SAAQ,+BAAc;
|
|
1
|
+
{"version":3,"file":"ACDCConverterDCTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/ACDCConverterDCTerminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,26 @@ const CsPpccControlKind_1 = require("./CsPpccControlKind");
|
|
|
7
7
|
const utils_1 = require("../../converter/integral7/utils");
|
|
8
8
|
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
9
9
|
class CsConverter extends ACDCConverter_1.ACDCConverter {
|
|
10
|
+
/** Maximum firing angle. CSC configuration data used in power flow. */
|
|
11
|
+
maxAlpha;
|
|
12
|
+
/** Maximum extinction angle. CSC configuration data used in power flow. */
|
|
13
|
+
maxGamma;
|
|
14
|
+
/** The maximum direct current (Id) on the DC side at which the converter should operate. Converter configuration data use in power flow. */
|
|
15
|
+
maxIdc;
|
|
16
|
+
/** Minimum firing angle. CSC configuration data used in power flow. */
|
|
17
|
+
minAlpha;
|
|
18
|
+
/** Minimum extinction angle. CSC configuration data used in power flow.*/
|
|
19
|
+
minGamma;
|
|
20
|
+
/** The minimum direct current (Id) on the DC side at which the converter should operate. CSC configuration data used in power flow. */
|
|
21
|
+
minIdc;
|
|
22
|
+
/** Rated converter DC current, also called IdN. Converter configuration data used in power flow. */
|
|
23
|
+
ratedIdc;
|
|
24
|
+
//SSH Profil
|
|
25
|
+
operatingMode; //mandatory
|
|
26
|
+
pPccControl; //mandatory
|
|
27
|
+
targetAlpha; //ActivePower mandatory
|
|
28
|
+
targetGamma; //ActivePower mandatory
|
|
29
|
+
targetIdc; //ActivePower mandatory
|
|
10
30
|
constructor(uuid, name, shortName, description) {
|
|
11
31
|
super(uuid, name, shortName, description);
|
|
12
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CsConverter.js","sourceRoot":"","sources":["../../../src/model/dc/CsConverter.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,qDAAgD;AAIhD,2DAAsD;AAEtD,2DAA4D;AAC5D,kEAAoF;AAEpF,MAAa,WAAY,SAAQ,6BAAa;
|
|
1
|
+
{"version":3,"file":"CsConverter.js","sourceRoot":"","sources":["../../../src/model/dc/CsConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,8 @@ const ACDCTerminal_1 = require("../core/ACDCTerminal");
|
|
|
5
5
|
const rdf_xml_1 = require("../../constants/rdf-xml");
|
|
6
6
|
const xml_serializer_1 = require("../../util/xml/xml.serializer");
|
|
7
7
|
class DCBaseTerminal extends ACDCTerminal_1.ACDCTerminal {
|
|
8
|
+
dcNode;
|
|
9
|
+
dcNodeUUID;
|
|
8
10
|
toCIMXMLAssociations(xmlWriter, profile) {
|
|
9
11
|
super.toCIMXMLAssociations(xmlWriter, profile);
|
|
10
12
|
if (profile === rdf_xml_1.RDF_XML.PROFILE_EQ) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DCBaseTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/DCBaseTerminal.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAElD,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,cAAe,SAAQ,2BAAY;
|
|
1
|
+
{"version":3,"file":"DCBaseTerminal.js","sourceRoot":"","sources":["../../../src/model/dc/DCBaseTerminal.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAElD,qDAAgD;AAEhD,kEAAsE;AAEtE,MAAa,cAAe,SAAQ,2BAAY;IAE9C,MAAM,CAAS;IACf,UAAU,CAAS;IAET,oBAAoB,CAAC,SAAoB,EAAE,OAAe;QAClE,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,KAAK,iBAAO,CAAC,UAAU,EAAE;YAClC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,uBAAuB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC5F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACrG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM,IAAI,IAAI,CAAC,UAAU,EAAE;gBAC1B,SAAS,CAAC,cAAc,CAAC,iBAAO,CAAC,aAAa,EAAE,uBAAuB,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;gBAC5F,IAAA,sCAAqB,EAAC,SAAS,EAAE,iBAAO,CAAC,SAAS,EAAE,GAAG,iBAAO,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;gBACpG,SAAS,CAAC,UAAU,EAAE,CAAC;aACxB;iBAAM;gBACL,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,gBAAgB,EAAE;oBAC9C,SAAS,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC;iBACjD;aACF;SACF;IACH,CAAC;CACF;AAvBD,wCAuBC"}
|
|
@@ -3,10 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DCConductingEquipment = void 0;
|
|
4
4
|
const Equipment_1 = require("../core/Equipment");
|
|
5
5
|
class DCConductingEquipment extends Equipment_1.Equipment {
|
|
6
|
-
|
|
7
|
-
super(...arguments);
|
|
8
|
-
this.dCTerminals = new Map();
|
|
9
|
-
}
|
|
6
|
+
dCTerminals = new Map();
|
|
10
7
|
}
|
|
11
8
|
exports.DCConductingEquipment = DCConductingEquipment;
|
|
12
9
|
//# sourceMappingURL=DCConductingEquipment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DCConductingEquipment.js","sourceRoot":"","sources":["../../../src/model/dc/DCConductingEquipment.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAE9C,MAAa,qBAAsB,SAAQ,qBAAS;
|
|
1
|
+
{"version":3,"file":"DCConductingEquipment.js","sourceRoot":"","sources":["../../../src/model/dc/DCConductingEquipment.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAE9C,MAAa,qBAAsB,SAAQ,qBAAS;IAElD,WAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;CAElD;AAJD,sDAIC"}
|