Fix copy/paste of pumping station

gitlab #43
APROS-15307

Change-Id: I07dfa7852146c471fe177c7322c773320fefedac

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 99c1afce431f3eb63f5be65b3d3ff74fc5ce7f61..aa801f0874b825f4a1834cd3fe43b850b1867cad 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -76,7 +76,41 @@ DN.Vertex <T DN.Element
     >-- DN.Vertex.HasValvePosition
         @defProperty "Valve position" L0.Double 
     >-- DN.Vertex.HasNominalPressureLoss
-        @defProperty "Nominal Pressure Loss" L0.Double 
+        @defProperty "Nominal Pressure Loss" L0.Double
+    >-- DN.Vertex.HasPumpInReturnLine
+        @defProperty "Pump in Return Line" L0.Double
+    >-- DN.Vertex.HasHeadPumpMaximum
+        @defProperty "Head pump maximum" L0.Double
+    >-- DN.Vertex.HasHeadPumpNominal
+        @defProperty "Head pump nominal" L0.Double
+    >-- DN.Vertex.HasFrequencyConverterControlled
+        @defProperty "Frequency Converter Controlled" L0.Double
+    >-- DN.Vertex.HasInternalValveMeasurement
+        @defProperty "Internal Valve Measurement" L0.Double
+    >-- DN.Vertex.HasPumpMassFlowNominal
+        @defProperty "Pump Mass Flow Nominal" L0.Double
+    >-- DN.Vertex.HasPumpMeMax
+        @defProperty "Pump Me Max" L0.Double
+    >-- DN.Vertex.HasPumpMeMin
+        @defProperty "Pump Me Min" L0.Double
+    >-- DN.Vertex.HasPumpSpeedMax
+        @defProperty "Pump Speed Max" L0.Double
+    >-- DN.Vertex.HasPumpSpeedMin
+        @defProperty "Pump Speed Min" L0.Double
+    >-- DN.Vertex.HasValveReturnLine
+        @defProperty "Valve Return Line" L0.Double
+    >-- DN.Vertex.HasValveMeMax
+        @defProperty "Valve Me Max" L0.Double
+    >-- DN.Vertex.HasValveMeMin
+        @defProperty "Valve Me Min" L0.Double
+    >-- DN.Vertex.HasValveMinPosition
+        @defProperty "Valve Min Position" L0.Double
+    >-- DN.Vertex.HasValveOutletMode
+        @defProperty "Valve Outlet Mode" L0.Double
+    >-- DN.Vertex.HasValvePressLossNominal
+        @defProperty "Valve Press Loss Nominal" L0.Double
+    >-- DN.Vertex.HasOpeningTime 
+        @defProperty "Opening Time" L0.Double
     @L0.assert DN.Vertex.HasElevation 0.0
 
 DN.Edge <T DN.Element
@@ -259,6 +293,27 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
     >-- DN.Mapping.VertexMapping.NominalPressureLossAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.NominalMassFlowAttribute --> L0.String <R L0.HasProperty
 
+    // pumping station
+    >-- DN.Mapping.VertexMapping.HeadPumpMaximumAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.HeadPumpNominalAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.FrequencyConverterControlledAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.InternalValveMeasurementAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.PumpInReturnLineAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.PumpMassFlowNominalAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.PumpMeMaxAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.PumpMeMinAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.PumpSpeedMaxAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.PumpSpeedMinAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.ValveReturnLineAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.ValveMeMaxAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.ValveMeMinAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.ValveMinPositionAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.ValveOutletModeAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.ValvePressLossNominalAttribute --> L0.String <R L0.HasProperty
+
+    // valve
+    >-- DN.Mapping.VertexMapping.OpeningTimeAttribute --> L0.String <R L0.HasProperty
+    
 DN.Mapping.EdgeMapping <T DN.Mapping.Base
     >-- DN.Mapping.EdgeMapping.LengthAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.DiameterAttribute --> L0.String <R L0.HasProperty

diff --git a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
index 6ab5a10d9d74e58b2108be74d4aeadcbe77e3a91..0409dcfcedf4ff9a31f2b9ba28e65bc11b664f31 100644 (file)
--- a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
+++ b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
@@ -205,10 +205,18 @@ public class DistrictNetworkResource {
     public final Resource Mapping_VertexMapping_ElevationAttribute_Inverse;
     public final Resource Mapping_VertexMapping_FlowAreaAttribute;
     public final Resource Mapping_VertexMapping_FlowAreaAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_FrequencyConverterControlledAttribute;
+    public final Resource Mapping_VertexMapping_FrequencyConverterControlledAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_HeadPumpMaximumAttribute;
+    public final Resource Mapping_VertexMapping_HeadPumpMaximumAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_HeadPumpNominalAttribute;
+    public final Resource Mapping_VertexMapping_HeadPumpNominalAttribute_Inverse;
     public final Resource Mapping_VertexMapping_HeatLoadDsAttribute;
     public final Resource Mapping_VertexMapping_HeatLoadDsAttribute_Inverse;
     public final Resource Mapping_VertexMapping_HeatPowerAttribute;
     public final Resource Mapping_VertexMapping_HeatPowerAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_InternalValveMeasurementAttribute;
+    public final Resource Mapping_VertexMapping_InternalValveMeasurementAttribute_Inverse;
     public final Resource Mapping_VertexMapping_MassFlowAttribute;
     public final Resource Mapping_VertexMapping_MassFlowAttribute_Inverse;
     public final Resource Mapping_VertexMapping_MaximumHeadMAttribute;
@@ -223,6 +231,20 @@ public class DistrictNetworkResource {
     public final Resource Mapping_VertexMapping_NominalMassFlowAttribute_Inverse;
     public final Resource Mapping_VertexMapping_NominalPressureLossAttribute;
     public final Resource Mapping_VertexMapping_NominalPressureLossAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_OpeningTimeAttribute;
+    public final Resource Mapping_VertexMapping_OpeningTimeAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_PumpInReturnLineAttribute;
+    public final Resource Mapping_VertexMapping_PumpInReturnLineAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_PumpMassFlowNominalAttribute;
+    public final Resource Mapping_VertexMapping_PumpMassFlowNominalAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_PumpMeMaxAttribute;
+    public final Resource Mapping_VertexMapping_PumpMeMaxAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_PumpMeMinAttribute;
+    public final Resource Mapping_VertexMapping_PumpMeMinAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_PumpSpeedMaxAttribute;
+    public final Resource Mapping_VertexMapping_PumpSpeedMaxAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_PumpSpeedMinAttribute;
+    public final Resource Mapping_VertexMapping_PumpSpeedMinAttribute_Inverse;
     public final Resource Mapping_VertexMapping_ReturnPressureAttribute;
     public final Resource Mapping_VertexMapping_ReturnPressureAttribute_Inverse;
     public final Resource Mapping_VertexMapping_ReturnTemperatureAttribute;
@@ -231,8 +253,20 @@ public class DistrictNetworkResource {
     public final Resource Mapping_VertexMapping_SupplyPressureAttribute_Inverse;
     public final Resource Mapping_VertexMapping_SupplyTemperatureAttribute;
     public final Resource Mapping_VertexMapping_SupplyTemperatureAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_ValveMeMaxAttribute;
+    public final Resource Mapping_VertexMapping_ValveMeMaxAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_ValveMeMinAttribute;
+    public final Resource Mapping_VertexMapping_ValveMeMinAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_ValveMinPositionAttribute;
+    public final Resource Mapping_VertexMapping_ValveMinPositionAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_ValveOutletModeAttribute;
+    public final Resource Mapping_VertexMapping_ValveOutletModeAttribute_Inverse;
     public final Resource Mapping_VertexMapping_ValvePositionAttribute;
     public final Resource Mapping_VertexMapping_ValvePositionAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_ValvePressLossNominalAttribute;
+    public final Resource Mapping_VertexMapping_ValvePressLossNominalAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_ValveReturnLineAttribute;
+    public final Resource Mapping_VertexMapping_ValveReturnLineAttribute_Inverse;
     public final Resource Mapping_VertexMapping_VelocityAttribute;
     public final Resource Mapping_VertexMapping_VelocityAttribute_Inverse;
     public final Resource Mapping_VertexMapping_VolFlowAttribute;
@@ -272,10 +306,18 @@ public class DistrictNetworkResource {
     public final Resource Vertex_HasElevation_Inverse;
     public final Resource Vertex_HasFlowArea;
     public final Resource Vertex_HasFlowArea_Inverse;
+    public final Resource Vertex_HasFrequencyConverterControlled;
+    public final Resource Vertex_HasFrequencyConverterControlled_Inverse;
+    public final Resource Vertex_HasHeadPumpMaximum;
+    public final Resource Vertex_HasHeadPumpMaximum_Inverse;
+    public final Resource Vertex_HasHeadPumpNominal;
+    public final Resource Vertex_HasHeadPumpNominal_Inverse;
     public final Resource Vertex_HasHeatLoadDs;
     public final Resource Vertex_HasHeatLoadDs_Inverse;
     public final Resource Vertex_HasHeatPower;
     public final Resource Vertex_HasHeatPower_Inverse;
+    public final Resource Vertex_HasInternalValveMeasurement;
+    public final Resource Vertex_HasInternalValveMeasurement_Inverse;
     public final Resource Vertex_HasMassFlow;
     public final Resource Vertex_HasMassFlow_Inverse;
     public final Resource Vertex_HasMaximumHeadM;
@@ -288,6 +330,20 @@ public class DistrictNetworkResource {
     public final Resource Vertex_HasNominalHeadM_Inverse;
     public final Resource Vertex_HasNominalPressureLoss;
     public final Resource Vertex_HasNominalPressureLoss_Inverse;
+    public final Resource Vertex_HasOpeningTime;
+    public final Resource Vertex_HasOpeningTime_Inverse;
+    public final Resource Vertex_HasPumpInReturnLine;
+    public final Resource Vertex_HasPumpInReturnLine_Inverse;
+    public final Resource Vertex_HasPumpMassFlowNominal;
+    public final Resource Vertex_HasPumpMassFlowNominal_Inverse;
+    public final Resource Vertex_HasPumpMeMax;
+    public final Resource Vertex_HasPumpMeMax_Inverse;
+    public final Resource Vertex_HasPumpMeMin;
+    public final Resource Vertex_HasPumpMeMin_Inverse;
+    public final Resource Vertex_HasPumpSpeedMax;
+    public final Resource Vertex_HasPumpSpeedMax_Inverse;
+    public final Resource Vertex_HasPumpSpeedMin;
+    public final Resource Vertex_HasPumpSpeedMin_Inverse;
     public final Resource Vertex_HasReturnPressure;
     public final Resource Vertex_HasReturnPressure_Inverse;
     public final Resource Vertex_HasReturnTemperature;
@@ -296,8 +352,20 @@ public class DistrictNetworkResource {
     public final Resource Vertex_HasSupplyPressure_Inverse;
     public final Resource Vertex_HasSupplyTemperature;
     public final Resource Vertex_HasSupplyTemperature_Inverse;
+    public final Resource Vertex_HasValveMeMax;
+    public final Resource Vertex_HasValveMeMax_Inverse;
+    public final Resource Vertex_HasValveMeMin;
+    public final Resource Vertex_HasValveMeMin_Inverse;
+    public final Resource Vertex_HasValveMinPosition;
+    public final Resource Vertex_HasValveMinPosition_Inverse;
+    public final Resource Vertex_HasValveOutletMode;
+    public final Resource Vertex_HasValveOutletMode_Inverse;
     public final Resource Vertex_HasValvePosition;
     public final Resource Vertex_HasValvePosition_Inverse;
+    public final Resource Vertex_HasValvePressLossNominal;
+    public final Resource Vertex_HasValvePressLossNominal_Inverse;
+    public final Resource Vertex_HasValveReturnLine;
+    public final Resource Vertex_HasValveReturnLine_Inverse;
     public final Resource Vertex_HasVelocity;
     public final Resource Vertex_HasVelocity_Inverse;
     public final Resource Vertex_HasVolFlow;
@@ -509,10 +577,18 @@ public class DistrictNetworkResource {
         public static final String Mapping_VertexMapping_ElevationAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ElevationAttribute/Inverse";
         public static final String Mapping_VertexMapping_FlowAreaAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/FlowAreaAttribute";
         public static final String Mapping_VertexMapping_FlowAreaAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/FlowAreaAttribute/Inverse";
+        public static final String Mapping_VertexMapping_FrequencyConverterControlledAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/FrequencyConverterControlledAttribute";
+        public static final String Mapping_VertexMapping_FrequencyConverterControlledAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/FrequencyConverterControlledAttribute/Inverse";
+        public static final String Mapping_VertexMapping_HeadPumpMaximumAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/HeadPumpMaximumAttribute";
+        public static final String Mapping_VertexMapping_HeadPumpMaximumAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/HeadPumpMaximumAttribute/Inverse";
+        public static final String Mapping_VertexMapping_HeadPumpNominalAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/HeadPumpNominalAttribute";
+        public static final String Mapping_VertexMapping_HeadPumpNominalAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/HeadPumpNominalAttribute/Inverse";
         public static final String Mapping_VertexMapping_HeatLoadDsAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/HeatLoadDsAttribute";
         public static final String Mapping_VertexMapping_HeatLoadDsAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/HeatLoadDsAttribute/Inverse";
         public static final String Mapping_VertexMapping_HeatPowerAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/HeatPowerAttribute";
         public static final String Mapping_VertexMapping_HeatPowerAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/HeatPowerAttribute/Inverse";
+        public static final String Mapping_VertexMapping_InternalValveMeasurementAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/InternalValveMeasurementAttribute";
+        public static final String Mapping_VertexMapping_InternalValveMeasurementAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/InternalValveMeasurementAttribute/Inverse";
         public static final String Mapping_VertexMapping_MassFlowAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/MassFlowAttribute";
         public static final String Mapping_VertexMapping_MassFlowAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/MassFlowAttribute/Inverse";
         public static final String Mapping_VertexMapping_MaximumHeadMAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/MaximumHeadMAttribute";
@@ -527,6 +603,20 @@ public class DistrictNetworkResource {
         public static final String Mapping_VertexMapping_NominalMassFlowAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/NominalMassFlowAttribute/Inverse";
         public static final String Mapping_VertexMapping_NominalPressureLossAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/NominalPressureLossAttribute";
         public static final String Mapping_VertexMapping_NominalPressureLossAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/NominalPressureLossAttribute/Inverse";
+        public static final String Mapping_VertexMapping_OpeningTimeAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/OpeningTimeAttribute";
+        public static final String Mapping_VertexMapping_OpeningTimeAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/OpeningTimeAttribute/Inverse";
+        public static final String Mapping_VertexMapping_PumpInReturnLineAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpInReturnLineAttribute";
+        public static final String Mapping_VertexMapping_PumpInReturnLineAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpInReturnLineAttribute/Inverse";
+        public static final String Mapping_VertexMapping_PumpMassFlowNominalAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpMassFlowNominalAttribute";
+        public static final String Mapping_VertexMapping_PumpMassFlowNominalAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpMassFlowNominalAttribute/Inverse";
+        public static final String Mapping_VertexMapping_PumpMeMaxAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpMeMaxAttribute";
+        public static final String Mapping_VertexMapping_PumpMeMaxAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpMeMaxAttribute/Inverse";
+        public static final String Mapping_VertexMapping_PumpMeMinAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpMeMinAttribute";
+        public static final String Mapping_VertexMapping_PumpMeMinAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpMeMinAttribute/Inverse";
+        public static final String Mapping_VertexMapping_PumpSpeedMaxAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpSpeedMaxAttribute";
+        public static final String Mapping_VertexMapping_PumpSpeedMaxAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpSpeedMaxAttribute/Inverse";
+        public static final String Mapping_VertexMapping_PumpSpeedMinAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpSpeedMinAttribute";
+        public static final String Mapping_VertexMapping_PumpSpeedMinAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PumpSpeedMinAttribute/Inverse";
         public static final String Mapping_VertexMapping_ReturnPressureAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ReturnPressureAttribute";
         public static final String Mapping_VertexMapping_ReturnPressureAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ReturnPressureAttribute/Inverse";
         public static final String Mapping_VertexMapping_ReturnTemperatureAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ReturnTemperatureAttribute";
@@ -535,8 +625,20 @@ public class DistrictNetworkResource {
         public static final String Mapping_VertexMapping_SupplyPressureAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/SupplyPressureAttribute/Inverse";
         public static final String Mapping_VertexMapping_SupplyTemperatureAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/SupplyTemperatureAttribute";
         public static final String Mapping_VertexMapping_SupplyTemperatureAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/SupplyTemperatureAttribute/Inverse";
+        public static final String Mapping_VertexMapping_ValveMeMaxAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveMeMaxAttribute";
+        public static final String Mapping_VertexMapping_ValveMeMaxAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveMeMaxAttribute/Inverse";
+        public static final String Mapping_VertexMapping_ValveMeMinAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveMeMinAttribute";
+        public static final String Mapping_VertexMapping_ValveMeMinAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveMeMinAttribute/Inverse";
+        public static final String Mapping_VertexMapping_ValveMinPositionAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveMinPositionAttribute";
+        public static final String Mapping_VertexMapping_ValveMinPositionAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveMinPositionAttribute/Inverse";
+        public static final String Mapping_VertexMapping_ValveOutletModeAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveOutletModeAttribute";
+        public static final String Mapping_VertexMapping_ValveOutletModeAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveOutletModeAttribute/Inverse";
         public static final String Mapping_VertexMapping_ValvePositionAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValvePositionAttribute";
         public static final String Mapping_VertexMapping_ValvePositionAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValvePositionAttribute/Inverse";
+        public static final String Mapping_VertexMapping_ValvePressLossNominalAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValvePressLossNominalAttribute";
+        public static final String Mapping_VertexMapping_ValvePressLossNominalAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValvePressLossNominalAttribute/Inverse";
+        public static final String Mapping_VertexMapping_ValveReturnLineAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveReturnLineAttribute";
+        public static final String Mapping_VertexMapping_ValveReturnLineAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ValveReturnLineAttribute/Inverse";
         public static final String Mapping_VertexMapping_VelocityAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/VelocityAttribute";
         public static final String Mapping_VertexMapping_VelocityAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/VelocityAttribute/Inverse";
         public static final String Mapping_VertexMapping_VolFlowAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/VolFlowAttribute";
@@ -576,10 +678,18 @@ public class DistrictNetworkResource {
         public static final String Vertex_HasElevation_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasElevation/Inverse";
         public static final String Vertex_HasFlowArea = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasFlowArea";
         public static final String Vertex_HasFlowArea_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasFlowArea/Inverse";
+        public static final String Vertex_HasFrequencyConverterControlled = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasFrequencyConverterControlled";
+        public static final String Vertex_HasFrequencyConverterControlled_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasFrequencyConverterControlled/Inverse";
+        public static final String Vertex_HasHeadPumpMaximum = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasHeadPumpMaximum";
+        public static final String Vertex_HasHeadPumpMaximum_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasHeadPumpMaximum/Inverse";
+        public static final String Vertex_HasHeadPumpNominal = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasHeadPumpNominal";
+        public static final String Vertex_HasHeadPumpNominal_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasHeadPumpNominal/Inverse";
         public static final String Vertex_HasHeatLoadDs = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasHeatLoadDs";
         public static final String Vertex_HasHeatLoadDs_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasHeatLoadDs/Inverse";
         public static final String Vertex_HasHeatPower = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasHeatPower";
         public static final String Vertex_HasHeatPower_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasHeatPower/Inverse";
+        public static final String Vertex_HasInternalValveMeasurement = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasInternalValveMeasurement";
+        public static final String Vertex_HasInternalValveMeasurement_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasInternalValveMeasurement/Inverse";
         public static final String Vertex_HasMassFlow = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasMassFlow";
         public static final String Vertex_HasMassFlow_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasMassFlow/Inverse";
         public static final String Vertex_HasMaximumHeadM = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasMaximumHeadM";
@@ -592,6 +702,20 @@ public class DistrictNetworkResource {
         public static final String Vertex_HasNominalHeadM_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasNominalHeadM/Inverse";
         public static final String Vertex_HasNominalPressureLoss = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasNominalPressureLoss";
         public static final String Vertex_HasNominalPressureLoss_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasNominalPressureLoss/Inverse";
+        public static final String Vertex_HasOpeningTime = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasOpeningTime";
+        public static final String Vertex_HasOpeningTime_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasOpeningTime/Inverse";
+        public static final String Vertex_HasPumpInReturnLine = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpInReturnLine";
+        public static final String Vertex_HasPumpInReturnLine_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpInReturnLine/Inverse";
+        public static final String Vertex_HasPumpMassFlowNominal = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpMassFlowNominal";
+        public static final String Vertex_HasPumpMassFlowNominal_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpMassFlowNominal/Inverse";
+        public static final String Vertex_HasPumpMeMax = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpMeMax";
+        public static final String Vertex_HasPumpMeMax_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpMeMax/Inverse";
+        public static final String Vertex_HasPumpMeMin = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpMeMin";
+        public static final String Vertex_HasPumpMeMin_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpMeMin/Inverse";
+        public static final String Vertex_HasPumpSpeedMax = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpSpeedMax";
+        public static final String Vertex_HasPumpSpeedMax_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpSpeedMax/Inverse";
+        public static final String Vertex_HasPumpSpeedMin = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpSpeedMin";
+        public static final String Vertex_HasPumpSpeedMin_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPumpSpeedMin/Inverse";
         public static final String Vertex_HasReturnPressure = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasReturnPressure";
         public static final String Vertex_HasReturnPressure_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasReturnPressure/Inverse";
         public static final String Vertex_HasReturnTemperature = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasReturnTemperature";
@@ -600,8 +724,20 @@ public class DistrictNetworkResource {
         public static final String Vertex_HasSupplyPressure_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasSupplyPressure/Inverse";
         public static final String Vertex_HasSupplyTemperature = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasSupplyTemperature";
         public static final String Vertex_HasSupplyTemperature_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasSupplyTemperature/Inverse";
+        public static final String Vertex_HasValveMeMax = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveMeMax";
+        public static final String Vertex_HasValveMeMax_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveMeMax/Inverse";
+        public static final String Vertex_HasValveMeMin = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveMeMin";
+        public static final String Vertex_HasValveMeMin_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveMeMin/Inverse";
+        public static final String Vertex_HasValveMinPosition = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveMinPosition";
+        public static final String Vertex_HasValveMinPosition_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveMinPosition/Inverse";
+        public static final String Vertex_HasValveOutletMode = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveOutletMode";
+        public static final String Vertex_HasValveOutletMode_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveOutletMode/Inverse";
         public static final String Vertex_HasValvePosition = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValvePosition";
         public static final String Vertex_HasValvePosition_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValvePosition/Inverse";
+        public static final String Vertex_HasValvePressLossNominal = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValvePressLossNominal";
+        public static final String Vertex_HasValvePressLossNominal_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValvePressLossNominal/Inverse";
+        public static final String Vertex_HasValveReturnLine = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveReturnLine";
+        public static final String Vertex_HasValveReturnLine_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasValveReturnLine/Inverse";
         public static final String Vertex_HasVelocity = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasVelocity";
         public static final String Vertex_HasVelocity_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasVelocity/Inverse";
         public static final String Vertex_HasVolFlow = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasVolFlow";
@@ -823,10 +959,18 @@ public class DistrictNetworkResource {
         Mapping_VertexMapping_ElevationAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ElevationAttribute_Inverse);
         Mapping_VertexMapping_FlowAreaAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_FlowAreaAttribute);
         Mapping_VertexMapping_FlowAreaAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_FlowAreaAttribute_Inverse);
+        Mapping_VertexMapping_FrequencyConverterControlledAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_FrequencyConverterControlledAttribute);
+        Mapping_VertexMapping_FrequencyConverterControlledAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_FrequencyConverterControlledAttribute_Inverse);
+        Mapping_VertexMapping_HeadPumpMaximumAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_HeadPumpMaximumAttribute);
+        Mapping_VertexMapping_HeadPumpMaximumAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_HeadPumpMaximumAttribute_Inverse);
+        Mapping_VertexMapping_HeadPumpNominalAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_HeadPumpNominalAttribute);
+        Mapping_VertexMapping_HeadPumpNominalAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_HeadPumpNominalAttribute_Inverse);
         Mapping_VertexMapping_HeatLoadDsAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_HeatLoadDsAttribute);
         Mapping_VertexMapping_HeatLoadDsAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_HeatLoadDsAttribute_Inverse);
         Mapping_VertexMapping_HeatPowerAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_HeatPowerAttribute);
         Mapping_VertexMapping_HeatPowerAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_HeatPowerAttribute_Inverse);
+        Mapping_VertexMapping_InternalValveMeasurementAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_InternalValveMeasurementAttribute);
+        Mapping_VertexMapping_InternalValveMeasurementAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_InternalValveMeasurementAttribute_Inverse);
         Mapping_VertexMapping_MassFlowAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_MassFlowAttribute);
         Mapping_VertexMapping_MassFlowAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_MassFlowAttribute_Inverse);
         Mapping_VertexMapping_MaximumHeadMAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_MaximumHeadMAttribute);
@@ -841,6 +985,20 @@ public class DistrictNetworkResource {
         Mapping_VertexMapping_NominalMassFlowAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_NominalMassFlowAttribute_Inverse);
         Mapping_VertexMapping_NominalPressureLossAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_NominalPressureLossAttribute);
         Mapping_VertexMapping_NominalPressureLossAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_NominalPressureLossAttribute_Inverse);
+        Mapping_VertexMapping_OpeningTimeAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_OpeningTimeAttribute);
+        Mapping_VertexMapping_OpeningTimeAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_OpeningTimeAttribute_Inverse);
+        Mapping_VertexMapping_PumpInReturnLineAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpInReturnLineAttribute);
+        Mapping_VertexMapping_PumpInReturnLineAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpInReturnLineAttribute_Inverse);
+        Mapping_VertexMapping_PumpMassFlowNominalAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpMassFlowNominalAttribute);
+        Mapping_VertexMapping_PumpMassFlowNominalAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpMassFlowNominalAttribute_Inverse);
+        Mapping_VertexMapping_PumpMeMaxAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpMeMaxAttribute);
+        Mapping_VertexMapping_PumpMeMaxAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpMeMaxAttribute_Inverse);
+        Mapping_VertexMapping_PumpMeMinAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpMeMinAttribute);
+        Mapping_VertexMapping_PumpMeMinAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpMeMinAttribute_Inverse);
+        Mapping_VertexMapping_PumpSpeedMaxAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpSpeedMaxAttribute);
+        Mapping_VertexMapping_PumpSpeedMaxAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpSpeedMaxAttribute_Inverse);
+        Mapping_VertexMapping_PumpSpeedMinAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpSpeedMinAttribute);
+        Mapping_VertexMapping_PumpSpeedMinAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PumpSpeedMinAttribute_Inverse);
         Mapping_VertexMapping_ReturnPressureAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ReturnPressureAttribute);
         Mapping_VertexMapping_ReturnPressureAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ReturnPressureAttribute_Inverse);
         Mapping_VertexMapping_ReturnTemperatureAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ReturnTemperatureAttribute);
@@ -849,8 +1007,20 @@ public class DistrictNetworkResource {
         Mapping_VertexMapping_SupplyPressureAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_SupplyPressureAttribute_Inverse);
         Mapping_VertexMapping_SupplyTemperatureAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_SupplyTemperatureAttribute);
         Mapping_VertexMapping_SupplyTemperatureAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_SupplyTemperatureAttribute_Inverse);
+        Mapping_VertexMapping_ValveMeMaxAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveMeMaxAttribute);
+        Mapping_VertexMapping_ValveMeMaxAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveMeMaxAttribute_Inverse);
+        Mapping_VertexMapping_ValveMeMinAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveMeMinAttribute);
+        Mapping_VertexMapping_ValveMeMinAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveMeMinAttribute_Inverse);
+        Mapping_VertexMapping_ValveMinPositionAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveMinPositionAttribute);
+        Mapping_VertexMapping_ValveMinPositionAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveMinPositionAttribute_Inverse);
+        Mapping_VertexMapping_ValveOutletModeAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveOutletModeAttribute);
+        Mapping_VertexMapping_ValveOutletModeAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveOutletModeAttribute_Inverse);
         Mapping_VertexMapping_ValvePositionAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValvePositionAttribute);
         Mapping_VertexMapping_ValvePositionAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValvePositionAttribute_Inverse);
+        Mapping_VertexMapping_ValvePressLossNominalAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValvePressLossNominalAttribute);
+        Mapping_VertexMapping_ValvePressLossNominalAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValvePressLossNominalAttribute_Inverse);
+        Mapping_VertexMapping_ValveReturnLineAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveReturnLineAttribute);
+        Mapping_VertexMapping_ValveReturnLineAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ValveReturnLineAttribute_Inverse);
         Mapping_VertexMapping_VelocityAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_VelocityAttribute);
         Mapping_VertexMapping_VelocityAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_VelocityAttribute_Inverse);
         Mapping_VertexMapping_VolFlowAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_VolFlowAttribute);
@@ -890,10 +1060,18 @@ public class DistrictNetworkResource {
         Vertex_HasElevation_Inverse = getResourceOrNull(graph, URIs.Vertex_HasElevation_Inverse);
         Vertex_HasFlowArea = getResourceOrNull(graph, URIs.Vertex_HasFlowArea);
         Vertex_HasFlowArea_Inverse = getResourceOrNull(graph, URIs.Vertex_HasFlowArea_Inverse);
+        Vertex_HasFrequencyConverterControlled = getResourceOrNull(graph, URIs.Vertex_HasFrequencyConverterControlled);
+        Vertex_HasFrequencyConverterControlled_Inverse = getResourceOrNull(graph, URIs.Vertex_HasFrequencyConverterControlled_Inverse);
+        Vertex_HasHeadPumpMaximum = getResourceOrNull(graph, URIs.Vertex_HasHeadPumpMaximum);
+        Vertex_HasHeadPumpMaximum_Inverse = getResourceOrNull(graph, URIs.Vertex_HasHeadPumpMaximum_Inverse);
+        Vertex_HasHeadPumpNominal = getResourceOrNull(graph, URIs.Vertex_HasHeadPumpNominal);
+        Vertex_HasHeadPumpNominal_Inverse = getResourceOrNull(graph, URIs.Vertex_HasHeadPumpNominal_Inverse);
         Vertex_HasHeatLoadDs = getResourceOrNull(graph, URIs.Vertex_HasHeatLoadDs);
         Vertex_HasHeatLoadDs_Inverse = getResourceOrNull(graph, URIs.Vertex_HasHeatLoadDs_Inverse);
         Vertex_HasHeatPower = getResourceOrNull(graph, URIs.Vertex_HasHeatPower);
         Vertex_HasHeatPower_Inverse = getResourceOrNull(graph, URIs.Vertex_HasHeatPower_Inverse);
+        Vertex_HasInternalValveMeasurement = getResourceOrNull(graph, URIs.Vertex_HasInternalValveMeasurement);
+        Vertex_HasInternalValveMeasurement_Inverse = getResourceOrNull(graph, URIs.Vertex_HasInternalValveMeasurement_Inverse);
         Vertex_HasMassFlow = getResourceOrNull(graph, URIs.Vertex_HasMassFlow);
         Vertex_HasMassFlow_Inverse = getResourceOrNull(graph, URIs.Vertex_HasMassFlow_Inverse);
         Vertex_HasMaximumHeadM = getResourceOrNull(graph, URIs.Vertex_HasMaximumHeadM);
@@ -906,6 +1084,20 @@ public class DistrictNetworkResource {
         Vertex_HasNominalHeadM_Inverse = getResourceOrNull(graph, URIs.Vertex_HasNominalHeadM_Inverse);
         Vertex_HasNominalPressureLoss = getResourceOrNull(graph, URIs.Vertex_HasNominalPressureLoss);
         Vertex_HasNominalPressureLoss_Inverse = getResourceOrNull(graph, URIs.Vertex_HasNominalPressureLoss_Inverse);
+        Vertex_HasOpeningTime = getResourceOrNull(graph, URIs.Vertex_HasOpeningTime);
+        Vertex_HasOpeningTime_Inverse = getResourceOrNull(graph, URIs.Vertex_HasOpeningTime_Inverse);
+        Vertex_HasPumpInReturnLine = getResourceOrNull(graph, URIs.Vertex_HasPumpInReturnLine);
+        Vertex_HasPumpInReturnLine_Inverse = getResourceOrNull(graph, URIs.Vertex_HasPumpInReturnLine_Inverse);
+        Vertex_HasPumpMassFlowNominal = getResourceOrNull(graph, URIs.Vertex_HasPumpMassFlowNominal);
+        Vertex_HasPumpMassFlowNominal_Inverse = getResourceOrNull(graph, URIs.Vertex_HasPumpMassFlowNominal_Inverse);
+        Vertex_HasPumpMeMax = getResourceOrNull(graph, URIs.Vertex_HasPumpMeMax);
+        Vertex_HasPumpMeMax_Inverse = getResourceOrNull(graph, URIs.Vertex_HasPumpMeMax_Inverse);
+        Vertex_HasPumpMeMin = getResourceOrNull(graph, URIs.Vertex_HasPumpMeMin);
+        Vertex_HasPumpMeMin_Inverse = getResourceOrNull(graph, URIs.Vertex_HasPumpMeMin_Inverse);
+        Vertex_HasPumpSpeedMax = getResourceOrNull(graph, URIs.Vertex_HasPumpSpeedMax);
+        Vertex_HasPumpSpeedMax_Inverse = getResourceOrNull(graph, URIs.Vertex_HasPumpSpeedMax_Inverse);
+        Vertex_HasPumpSpeedMin = getResourceOrNull(graph, URIs.Vertex_HasPumpSpeedMin);
+        Vertex_HasPumpSpeedMin_Inverse = getResourceOrNull(graph, URIs.Vertex_HasPumpSpeedMin_Inverse);
         Vertex_HasReturnPressure = getResourceOrNull(graph, URIs.Vertex_HasReturnPressure);
         Vertex_HasReturnPressure_Inverse = getResourceOrNull(graph, URIs.Vertex_HasReturnPressure_Inverse);
         Vertex_HasReturnTemperature = getResourceOrNull(graph, URIs.Vertex_HasReturnTemperature);
@@ -914,8 +1106,20 @@ public class DistrictNetworkResource {
         Vertex_HasSupplyPressure_Inverse = getResourceOrNull(graph, URIs.Vertex_HasSupplyPressure_Inverse);
         Vertex_HasSupplyTemperature = getResourceOrNull(graph, URIs.Vertex_HasSupplyTemperature);
         Vertex_HasSupplyTemperature_Inverse = getResourceOrNull(graph, URIs.Vertex_HasSupplyTemperature_Inverse);
+        Vertex_HasValveMeMax = getResourceOrNull(graph, URIs.Vertex_HasValveMeMax);
+        Vertex_HasValveMeMax_Inverse = getResourceOrNull(graph, URIs.Vertex_HasValveMeMax_Inverse);
+        Vertex_HasValveMeMin = getResourceOrNull(graph, URIs.Vertex_HasValveMeMin);
+        Vertex_HasValveMeMin_Inverse = getResourceOrNull(graph, URIs.Vertex_HasValveMeMin_Inverse);
+        Vertex_HasValveMinPosition = getResourceOrNull(graph, URIs.Vertex_HasValveMinPosition);
+        Vertex_HasValveMinPosition_Inverse = getResourceOrNull(graph, URIs.Vertex_HasValveMinPosition_Inverse);
+        Vertex_HasValveOutletMode = getResourceOrNull(graph, URIs.Vertex_HasValveOutletMode);
+        Vertex_HasValveOutletMode_Inverse = getResourceOrNull(graph, URIs.Vertex_HasValveOutletMode_Inverse);
         Vertex_HasValvePosition = getResourceOrNull(graph, URIs.Vertex_HasValvePosition);
         Vertex_HasValvePosition_Inverse = getResourceOrNull(graph, URIs.Vertex_HasValvePosition_Inverse);
+        Vertex_HasValvePressLossNominal = getResourceOrNull(graph, URIs.Vertex_HasValvePressLossNominal);
+        Vertex_HasValvePressLossNominal_Inverse = getResourceOrNull(graph, URIs.Vertex_HasValvePressLossNominal_Inverse);
+        Vertex_HasValveReturnLine = getResourceOrNull(graph, URIs.Vertex_HasValveReturnLine);
+        Vertex_HasValveReturnLine_Inverse = getResourceOrNull(graph, URIs.Vertex_HasValveReturnLine_Inverse);
         Vertex_HasVelocity = getResourceOrNull(graph, URIs.Vertex_HasVelocity);
         Vertex_HasVelocity_Inverse = getResourceOrNull(graph, URIs.Vertex_HasVelocity_Inverse);
         Vertex_HasVolFlow = getResourceOrNull(graph, URIs.Vertex_HasVolFlow);

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/PasteDistrictVertexHandler.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/PasteDistrictVertexHandler.java
index c9aa0f3cfc4c04c95cc9b1faebbf2c9fa03d31f4..7fadac3fd32743aac2800e79017027463c22fd2a 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/PasteDistrictVertexHandler.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/PasteDistrictVertexHandler.java
@@ -137,53 +137,14 @@ public class PasteDistrictVertexHandler {
                     DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
                     
                     Resource sourceMappedElement = graph.getPossibleObject(sourceElement, DN.MappedComponent);
-                    sourceCopyAttributes.putAll(copyAttributes(graph, sourceMappedElement));
+                    sourceCopyAttributes.putAll(copyAttributes(graph, sourceElement, sourceMappedElement));
                     Resource targetMappedElement = graph.getPossibleObject(targetElement, DN.MappedComponent);
-                    targetCopyAttributes.putAll(copyAttributes(graph, targetMappedElement));
+                    targetCopyAttributes.putAll(copyAttributes(graph, targetElement, targetMappedElement));
                     if (sourceMappedElement != null && cut)
                         RemoverUtil.remove(graph, sourceMappedElement);
                     if (targetMappedElement != null)
                         RemoverUtil.remove(graph, targetMappedElement);
                 }
-                
-                private Map<Resource, Object> copyAttributes(WriteGraph graph, Resource mappedElement) throws DatabaseException {
-                    Layer0 L0 = Layer0.getInstance(graph);
-                    DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
-
-                    Resource mapping = graph.getSingleObject(sourceElement, DN.HasMapping);
-                    Collection<Statement> statements = graph.getStatements(mapping, L0.HasProperty);
-                    Collection<Statement> mappingAttributeStatements = statements.stream().filter(stm -> {
-                        try {
-                               Resource predicate = stm.getPredicate();
-                               Resource hasDomain = graph.getPossibleObject(predicate, L0.HasDomain);
-                               if (hasDomain != null && hasDomain.equals(DN.Mapping_VertexMapping)) {
-                                       // filter out x and y and z
-                                       Resource vertexAttribute = attributeMappingToVertexAttribute(graph, DN, predicate);
-                                   return vertexAttribute != null;
-                               }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        return false;
-                    }).collect(Collectors.toList());
-                    Resource component = graph.getPossibleObject(mappedElement, ModelingResources.getInstance(graph).ElementToComponent);
-                    Variable variable = Variables.getVariable(graph, component);
-                    Map<Resource, Object> predValues = new HashMap<>();
-                    for (Statement stm : mappingAttributeStatements) {
-                        String propertyName = graph.getPossibleValue(stm.getObject());
-                        if (propertyName != null) {
-                            Object propertyValue = variable.getPossiblePropertyValue(graph, propertyName);
-                            if (propertyValue != null) {
-                                predValues.put(attributeMappingToVertexAttribute(graph, DN, stm.getPredicate()), propertyValue);
-                            } else {
-                                System.err.println("no property value for " + variable.getURI(graph) + " and property " + propertyName);
-                            }
-                        } else {
-                            System.err.println("stm.getObject() is not string " + stm.getObject());
-                        }
-                    }
-                    return predValues;
-                }
             });
             ThreadUtils.getNonBlockingWorkExecutor().schedule(() -> {
                 try {
@@ -273,6 +234,45 @@ public class PasteDistrictVertexHandler {
         
     }
     
+    private static Map<Resource, Object> copyAttributes(WriteGraph graph, Resource sourceElement, Resource mappedElement) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+
+        Resource mapping = graph.getSingleObject(sourceElement, DN.HasMapping);
+        Collection<Statement> statements = graph.getStatements(mapping, L0.HasProperty);
+        Collection<Statement> mappingAttributeStatements = statements.stream().filter(stm -> {
+            try {
+                Resource predicate = stm.getPredicate();
+                Resource hasDomain = graph.getPossibleObject(predicate, L0.HasDomain);
+                if (hasDomain != null && hasDomain.equals(DN.Mapping_VertexMapping)) {
+                    // filter out x and y and z
+                    Resource vertexAttribute = attributeMappingToVertexAttribute(graph, DN, predicate);
+                    return vertexAttribute != null;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return false;
+        }).collect(Collectors.toList());
+        Resource component = graph.getPossibleObject(mappedElement, ModelingResources.getInstance(graph).ElementToComponent);
+        Variable variable = Variables.getVariable(graph, component);
+        Map<Resource, Object> predValues = new HashMap<>();
+        for (Statement stm : mappingAttributeStatements) {
+            String propertyName = graph.getPossibleValue(stm.getObject());
+            if (propertyName != null) {
+                Object propertyValue = variable.getPossiblePropertyValue(graph, propertyName);
+                if (propertyValue != null) {
+                    predValues.put(attributeMappingToVertexAttribute(graph, DN, stm.getPredicate()), propertyValue);
+                } else {
+                    System.err.println("no property value for " + variable.getURI(graph) + " and property " + propertyName);
+                }
+            } else {
+                System.err.println("stm.getObject() is not string " + stm.getObject());
+            }
+        }
+        return predValues;
+    }
+    
     private static Resource attributeMappingToVertexAttribute(ReadGraph graph, DistrictNetworkResource DN, Resource attribute) throws DatabaseException {
        Resource attr = null;
         if (attribute.equals(DN.Mapping_VertexMapping_ElevationAttribute))
@@ -321,6 +321,40 @@ public class PasteDistrictVertexHandler {
                attr = DN.Vertex_HasVelocity;
         else if (attribute.equals(DN.Mapping_VertexMapping_VolFlowAttribute))
                attr = DN.Vertex_HasVolFlow;
+        else if (attribute.equals(DN.Mapping_VertexMapping_PumpInReturnLineAttribute))
+            attr = DN.Vertex_HasPumpInReturnLine;
+        else if (attribute.equals(DN.Mapping_VertexMapping_HeadPumpMaximumAttribute))
+            attr = DN.Vertex_HasHeadPumpMaximum;
+        else if (attribute.equals(DN.Mapping_VertexMapping_HeadPumpNominalAttribute))
+            attr = DN.Vertex_HasHeadPumpNominal;
+        else if (attribute.equals(DN.Mapping_VertexMapping_FrequencyConverterControlledAttribute))
+            attr = DN.Vertex_HasFrequencyConverterControlled;
+        else if (attribute.equals(DN.Mapping_VertexMapping_InternalValveMeasurementAttribute))
+            attr = DN.Vertex_HasInternalValveMeasurement;
+        else if (attribute.equals(DN.Mapping_VertexMapping_PumpMassFlowNominalAttribute))
+            attr = DN.Vertex_HasPumpMassFlowNominal;
+        else if (attribute.equals(DN.Mapping_VertexMapping_PumpMeMaxAttribute))
+            attr = DN.Vertex_HasPumpMeMax;
+        else if (attribute.equals(DN.Mapping_VertexMapping_PumpMeMinAttribute))
+            attr = DN.Vertex_HasPumpMeMin;
+        else if (attribute.equals(DN.Mapping_VertexMapping_PumpSpeedMaxAttribute))
+            attr = DN.Vertex_HasPumpSpeedMax;
+        else if (attribute.equals(DN.Mapping_VertexMapping_PumpSpeedMinAttribute))
+            attr = DN.Vertex_HasPumpSpeedMin;
+        else if (attribute.equals(DN.Mapping_VertexMapping_ValveReturnLineAttribute))
+            attr = DN.Vertex_HasValveReturnLine;
+        else if (attribute.equals(DN.Mapping_VertexMapping_ValveMeMaxAttribute))
+            attr = DN.Vertex_HasValveMeMax;
+        else if (attribute.equals(DN.Mapping_VertexMapping_ValveMeMinAttribute))
+            attr = DN.Vertex_HasValveMeMin;
+        else if (attribute.equals(DN.Mapping_VertexMapping_ValveMinPositionAttribute))
+            attr = DN.Vertex_HasValveMinPosition;
+        else if (attribute.equals(DN.Mapping_VertexMapping_ValveOutletModeAttribute))
+            attr = DN.Vertex_HasValveOutletMode;
+        else if (attribute.equals(DN.Mapping_VertexMapping_ValvePressLossNominalAttribute))
+            attr = DN.Vertex_HasValvePressLossNominal;
+        else if (attribute.equals(DN.Mapping_VertexMapping_OpeningTimeAttribute))
+            attr = DN.Vertex_HasOpeningTime;
         else if (attribute.equals(DN.Mapping_VertexMapping_XAttribute))
                attr = null; // ignore this!
         else if (attribute.equals(DN.Mapping_VertexMapping_YAttribute))