Support peakPower & alternative elevation in district CSV import

gitlab #56
APROS-15523

Change-Id: Ic8b2b008864a03b81aaa9adabdd6e0fab76eb30e

diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java
index c6e1b516dbcde3c97927acdeac21a9a73d25557e..268ed310df432885378907646e6976046793c607 100644 (file)
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java
+++ b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizardPage.java
@@ -58,6 +58,7 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor xCoordSelector;
     private DynamicComboFieldEditor yCoordSelector;
     private DynamicComboFieldEditor zValueSelector;
+    private DynamicComboFieldEditor altElevationValueSelector;
 
     private DynamicComboFieldEditor supplyTempValueSelector;
     private DynamicComboFieldEditor returnTempValueSelector;
@@ -66,6 +67,7 @@ public class CSVImportWizardPage extends WizardPage {
     private DynamicComboFieldEditor dpSelector;
     private DynamicComboFieldEditor dtSelector;
     private DynamicComboFieldEditor heatPowerSelector;
+    private DynamicComboFieldEditor peakPowerSelector;
     private DynamicComboFieldEditor nominalHeadMSelector;
     private DynamicComboFieldEditor nominalHeadBSelector;
     private DynamicComboFieldEditor nominalFlowSelector;
@@ -388,6 +390,22 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
+
+        altElevationValueSelector = new DynamicComboFieldEditor("altElevation", "Alternative Elevation", parent);
+        altElevationValueSelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.setAltElevationIndex(Integer.parseInt(altElevationValueSelector.getValue()));
+                validatePageComplete();
+            }
+        });
+        
         supplyTempValueSelector = new DynamicComboFieldEditor("tempValue", "Supply Temperature value", parent);
         supplyTempValueSelector.addComboListener(new SelectionListener() {
 
@@ -486,6 +504,20 @@ public class CSVImportWizardPage extends WizardPage {
                 validatePageComplete();
             }
         });
+        peakPowerSelector = new DynamicComboFieldEditor("peakPowerValue", "Peak Power", parent);
+        peakPowerSelector.addComboListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                widgetDefaultSelected(e);
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                model.setPeakPowerIndex(Integer.parseInt(peakPowerSelector.getValue()));
+                validatePageComplete();
+            }
+        });
         nominalHeadMSelector = new DynamicComboFieldEditor("nominalHeadMValue", "nominalHeadM", parent);
         nominalHeadMSelector.addComboListener(new SelectionListener() {
 
@@ -925,6 +957,7 @@ public class CSVImportWizardPage extends WizardPage {
         xCoordSelector.updateCombo(namesAndValues);
         yCoordSelector.updateCombo(namesAndValues);
         zValueSelector.updateCombo(namesAndValues);
+        altElevationValueSelector.updateCombo(namesAndValues);
         supplyTempValueSelector.updateCombo(namesAndValues);       
         returnTempValueSelector.updateCombo(namesAndValues);       
         supplyPressureValueSelector.updateCombo(namesAndValues);   
@@ -1006,7 +1039,7 @@ public class CSVImportWizardPage extends WizardPage {
         if (model.isVertexImport())
             setPageComplete(model.getXCoordIndex() != -1 && model.getYCoordIndex() != -1 && model.getComponentMappingIndex() != -1);
         else
-            setPageComplete(model.getStartXCoordIndex() != 1 && model.getStartYCoordIndex() != -1 && model.getEndXCoordIndex() != -1 && model.getEndYCoordIndex() != -1 && model.getComponentMappingIndex() != -1);
+            setPageComplete(model.getStartXCoordIndex() != -1 && model.getStartYCoordIndex() != -1 && model.getEndXCoordIndex() != -1 && model.getEndYCoordIndex() != -1 && model.getComponentMappingIndex() != -1);
     }
 
 }

diff --git a/org.simantics.district.imports/scl/Simantics/District/Import.scl b/org.simantics.district.imports/scl/Simantics/District/Import.scl
index 9e423ca4fbd3bfe64ff12f3b791e3f9d9ff4db61..a3d36f4c28e96aefb1bb344e079cc82075512fb3 100644 (file)
--- a/org.simantics.district.imports/scl/Simantics/District/Import.scl
+++ b/org.simantics.district.imports/scl/Simantics/District/Import.scl
@@ -16,8 +16,10 @@ importJava "org.simantics.district.imports.CSVImportModel" where
     setXCoordIndex :: CSVImportModel -> Integer -> <Proc> ()
     setYCoordIndex :: CSVImportModel -> Integer -> <Proc> ()
     setZCoordIndex :: CSVImportModel -> Integer -> <Proc> ()
+    setAltElevationIndex :: CSVImportModel -> Integer -> <Proc> ()
     setHeatLoadDsIndex :: CSVImportModel -> Integer -> <Proc> ()
     setHeatPowerIndex :: CSVImportModel -> Integer -> <Proc> ()
+    setPeakPowerIndex :: CSVImportModel -> Integer -> <Proc> ()
     
     // Edge
     setStartXCoordIndex :: CSVImportModel -> Integer -> <Proc> ()

diff --git a/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java b/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java
index 5041f1bbe69e2fe98356f532f1b98d0bfd626904..9f85225f3302fe51b83f6a65a9563932b22d7e9f 100644 (file)
--- a/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java
+++ b/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java
@@ -28,6 +28,7 @@ public class CSVImportModel {
     private int xCoordIndex = -1;
     private int yCoordIndex = -1;
     private int zCoordIndex = -1;
+    private int altElevationIndex = -1;
     
     // Edge import
     private int startXCoordIndex = -1;
@@ -72,6 +73,7 @@ public class CSVImportModel {
     private int addressIndex = -1;
     private int lengthIndex = -1;
     private int detailedGeometryIndex = -1;
+    private int peakPowerIndex = -1;
     
     // Third page
 
@@ -500,4 +502,20 @@ public class CSVImportModel {
     public int getDetailedGeometryIndex() {
         return detailedGeometryIndex;
     }
+
+    public int getAlternativeElevationIndex() {
+        return altElevationIndex;
+    }
+
+    public void setAltElevationIndex(int parseInt) {
+        this.altElevationIndex = parseInt;
+    }
+
+    public void setPeakPowerIndex(int parseInt) {
+        this.peakPowerIndex = parseInt;
+    }
+    
+    public int getPeakPowerIndex() {
+        return peakPowerIndex;
+    }
 }

diff --git a/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java b/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java
index b3b997b3ef3303104382247a6842880782290355..139b63e8d0bfe9b6eb2e4a99358ef7d2c20e9092 100644 (file)
--- a/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java
+++ b/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java
@@ -235,6 +235,7 @@ public class DistrictImportUtils {
         int xCoordColumnIndex = model.getXCoordIndex();
         int yCoordColumnIndex = model.getYCoordIndex();
         int zCoordColumnIndex = model.getZCoordIndex();
+        int altElevationIndex = model.getAlternativeElevationIndex();
         int supplyTempColumnIndex = model.getSupplyTempIndex();
         int returnTempColumnIndex = model.getReturnTempIndex();
         int supplyPressureColumnIndex = model.getSupplyPressureIndex();
@@ -242,6 +243,7 @@ public class DistrictImportUtils {
         int dpIndex = model.getDeltaPressureIndex();
         int dtIndex = model.getDeltaTemperatureIndex();
         int heatPowerIndex = model.getHeatPowerIndex();
+        int peakPowerIndex = model.getPeakPowerIndex();
         int valvePositionIndex = model.getValvePositionIndx();
         int nominalHeadMIndex = model.getNominalHeadMIndex();
         int nominalHeadBIndex = model.getNominalHeadBIndex();
@@ -303,7 +305,7 @@ public class DistrictImportUtils {
                                     }
                                 }
                             }
-                
+                            
                             double[] coords;
                             if (actualDoTransform) {
                                 DirectPosition2D targetPos = new DirectPosition2D();
@@ -321,6 +323,8 @@ public class DistrictImportUtils {
                             
                             writeStringValue(graph, row, idColumn, vertex, DN.HasId);
                             
+                            writeValue(graph, row, altElevationIndex, vertex, DN.Vertex_HasAltElevation);
+                            
                             writeValue(graph, row, supplyTempColumnIndex, vertex, DN.Vertex_HasSupplyTemperature);
                             writeValue(graph, row, returnTempColumnIndex, vertex, DN.Vertex_HasReturnTemperature);
                             writeValue(graph, row, supplyPressureColumnIndex, vertex, DN.Vertex_HasSupplyPressure);
@@ -328,6 +332,7 @@ public class DistrictImportUtils {
                             writeValue(graph, row, dpIndex, vertex, DN.Vertex_HasDeltaPressure);
                             writeValue(graph, row, dtIndex, vertex, DN.Vertex_HasDeltaTemperature);
                             writeValue(graph, row, heatPowerIndex, vertex, DN.Vertex_HasHeatPower);
+                            writeValue(graph, row, peakPowerIndex, vertex, DN.Vertex_HasPeakPower);
                             writeValue(graph, row, valvePositionIndex, vertex, DN.Vertex_HasValvePosition);
                             writeValue(graph, row, nominalHeadMIndex, vertex, DN.Vertex_HasNominalHeadM);
                             writeValue(graph, row, nominalHeadBIndex, vertex, DN.Vertex_HasNominalHeadB);
@@ -549,7 +554,7 @@ public class DistrictImportUtils {
                     double y = Double.parseDouble(p[1]);
                     if (actualTransform != null) {
                         DirectPosition2D targetPos = new DirectPosition2D();
-                        DirectPosition2D sourcePos = new DirectPosition2D(y, x);
+                        DirectPosition2D sourcePos = new DirectPosition2D(x, y);
                         DirectPosition res = actualTransform.transform(sourcePos, targetPos);
                         double[] coords = res.getCoordinate();
                         x = coords[1];

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index aa801f0874b825f4a1834cd3fe43b850b1867cad..2a64b3dc15ba566b838cb17487c0869c5b8be820 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -39,6 +39,8 @@ DN.Element <T DIA.Element : L0.Type
 DN.Vertex <T DN.Element
     >-- DN.Vertex.HasElevation
         @defProperty "Elevation" L0.Double
+    >-- DN.Vertex.HasAltElevation
+        @defProperty "Alternative Elevation" L0.Double
     >-- DN.Vertex.HasAddress
         @defProperty "Address" L0.String
     >-- DN.Vertex.HasSupplyTemperature
@@ -54,7 +56,9 @@ DN.Vertex <T DN.Element
     >-- DN.Vertex.HasDeltaTemperature
         @defProperty "Delta temperature" L0.Double 
     >-- DN.Vertex.HasHeatPower
-        @defProperty "Heat Power" L0.Double 
+        @defProperty "Heat Power" L0.Double
+    >-- DN.Vertex.HasPeakPower
+        @defProperty "Peak Power" L0.Double 
     >-- DN.Vertex.HasNominalHeadM
         @defProperty "NominalHeadM" L0.Double 
     >-- DN.Vertex.HasNominalHeadB
@@ -266,6 +270,7 @@ DN.Mapping.TerminalPair <T L0.Property
 DN.Mapping.VertexMapping <T DN.Mapping.Base
     // Common
     >-- DN.Mapping.VertexMapping.ElevationAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.ElevationAltAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.SupplyTemperatureAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.ReturnTemperatureAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.SupplyPressureAttribute --> L0.String <R L0.HasProperty
@@ -278,6 +283,7 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
     >-- DN.Mapping.VertexMapping.dpAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.dtAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.HeatPowerAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.PeakPowerAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.NominalHeadMAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.NominalHeadBAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.NominalFlowAttribute --> L0.String <R L0.HasProperty
@@ -325,7 +331,6 @@ DN.Mapping.EdgeMapping <T DN.Mapping.Base
     >-- DN.Mapping.EdgeMapping.TGroundAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.ElevationAttribute --> L0.String <R L0.HasProperty
 
-
 // Allowed connection types
 DN.SupplyConnectionType <T STR.ConnectionType
 

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 b7801e55a8397e2c40a590e4631b38c274468dbe..6ab3df7671685f273b86c442cbaf14a0053427ab 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
@@ -203,6 +203,8 @@ public class DistrictNetworkResource {
     public final Resource Mapping_VertexMapping_DeltaPressureAttribute_Inverse;
     public final Resource Mapping_VertexMapping_DeltaTemperatureAttribute;
     public final Resource Mapping_VertexMapping_DeltaTemperatureAttribute_Inverse;
+    public final Resource Mapping_VertexMapping_ElevationAltAttribute;
+    public final Resource Mapping_VertexMapping_ElevationAltAttribute_Inverse;
     public final Resource Mapping_VertexMapping_ElevationAttribute;
     public final Resource Mapping_VertexMapping_ElevationAttribute_Inverse;
     public final Resource Mapping_VertexMapping_FlowAreaAttribute;
@@ -235,6 +237,8 @@ public class DistrictNetworkResource {
     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_PeakPowerAttribute;
+    public final Resource Mapping_VertexMapping_PeakPowerAttribute_Inverse;
     public final Resource Mapping_VertexMapping_PumpInReturnLineAttribute;
     public final Resource Mapping_VertexMapping_PumpInReturnLineAttribute_Inverse;
     public final Resource Mapping_VertexMapping_PumpMassFlowNominalAttribute;
@@ -300,6 +304,8 @@ public class DistrictNetworkResource {
     public final Resource VertexSymbolStyle;
     public final Resource Vertex_HasAddress;
     public final Resource Vertex_HasAddress_Inverse;
+    public final Resource Vertex_HasAltElevation;
+    public final Resource Vertex_HasAltElevation_Inverse;
     public final Resource Vertex_HasDeltaPressure;
     public final Resource Vertex_HasDeltaPressure_Inverse;
     public final Resource Vertex_HasDeltaTemperature;
@@ -334,6 +340,8 @@ public class DistrictNetworkResource {
     public final Resource Vertex_HasNominalPressureLoss_Inverse;
     public final Resource Vertex_HasOpeningTime;
     public final Resource Vertex_HasOpeningTime_Inverse;
+    public final Resource Vertex_HasPeakPower;
+    public final Resource Vertex_HasPeakPower_Inverse;
     public final Resource Vertex_HasPumpInReturnLine;
     public final Resource Vertex_HasPumpInReturnLine_Inverse;
     public final Resource Vertex_HasPumpMassFlowNominal;
@@ -577,6 +585,8 @@ public class DistrictNetworkResource {
         public static final String Mapping_VertexMapping_DeltaPressureAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/DeltaPressureAttribute/Inverse";
         public static final String Mapping_VertexMapping_DeltaTemperatureAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/DeltaTemperatureAttribute";
         public static final String Mapping_VertexMapping_DeltaTemperatureAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/DeltaTemperatureAttribute/Inverse";
+        public static final String Mapping_VertexMapping_ElevationAltAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ElevationAltAttribute";
+        public static final String Mapping_VertexMapping_ElevationAltAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ElevationAltAttribute/Inverse";
         public static final String Mapping_VertexMapping_ElevationAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/ElevationAttribute";
         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";
@@ -609,6 +619,8 @@ public class DistrictNetworkResource {
         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_PeakPowerAttribute = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PeakPowerAttribute";
+        public static final String Mapping_VertexMapping_PeakPowerAttribute_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/VertexMapping/PeakPowerAttribute/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";
@@ -674,6 +686,8 @@ public class DistrictNetworkResource {
         public static final String VertexSymbolStyle = "http://www.simantics.org/DistrictNetwork-1.0/VertexSymbolStyle";
         public static final String Vertex_HasAddress = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasAddress";
         public static final String Vertex_HasAddress_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasAddress/Inverse";
+        public static final String Vertex_HasAltElevation = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasAltElevation";
+        public static final String Vertex_HasAltElevation_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasAltElevation/Inverse";
         public static final String Vertex_HasDeltaPressure = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasDeltaPressure";
         public static final String Vertex_HasDeltaPressure_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasDeltaPressure/Inverse";
         public static final String Vertex_HasDeltaTemperature = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasDeltaTemperature";
@@ -708,6 +722,8 @@ public class DistrictNetworkResource {
         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_HasPeakPower = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPeakPower";
+        public static final String Vertex_HasPeakPower_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/Vertex/HasPeakPower/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";
@@ -961,6 +977,8 @@ public class DistrictNetworkResource {
         Mapping_VertexMapping_DeltaPressureAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_DeltaPressureAttribute_Inverse);
         Mapping_VertexMapping_DeltaTemperatureAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_DeltaTemperatureAttribute);
         Mapping_VertexMapping_DeltaTemperatureAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_DeltaTemperatureAttribute_Inverse);
+        Mapping_VertexMapping_ElevationAltAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ElevationAltAttribute);
+        Mapping_VertexMapping_ElevationAltAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ElevationAltAttribute_Inverse);
         Mapping_VertexMapping_ElevationAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ElevationAttribute);
         Mapping_VertexMapping_ElevationAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_ElevationAttribute_Inverse);
         Mapping_VertexMapping_FlowAreaAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_FlowAreaAttribute);
@@ -993,6 +1011,8 @@ public class DistrictNetworkResource {
         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_PeakPowerAttribute = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PeakPowerAttribute);
+        Mapping_VertexMapping_PeakPowerAttribute_Inverse = getResourceOrNull(graph, URIs.Mapping_VertexMapping_PeakPowerAttribute_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);
@@ -1058,6 +1078,8 @@ public class DistrictNetworkResource {
         VertexSymbolStyle = getResourceOrNull(graph, URIs.VertexSymbolStyle);
         Vertex_HasAddress = getResourceOrNull(graph, URIs.Vertex_HasAddress);
         Vertex_HasAddress_Inverse = getResourceOrNull(graph, URIs.Vertex_HasAddress_Inverse);
+        Vertex_HasAltElevation = getResourceOrNull(graph, URIs.Vertex_HasAltElevation);
+        Vertex_HasAltElevation_Inverse = getResourceOrNull(graph, URIs.Vertex_HasAltElevation_Inverse);
         Vertex_HasDeltaPressure = getResourceOrNull(graph, URIs.Vertex_HasDeltaPressure);
         Vertex_HasDeltaPressure_Inverse = getResourceOrNull(graph, URIs.Vertex_HasDeltaPressure_Inverse);
         Vertex_HasDeltaTemperature = getResourceOrNull(graph, URIs.Vertex_HasDeltaTemperature);
@@ -1092,6 +1114,8 @@ public class DistrictNetworkResource {
         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_HasPeakPower = getResourceOrNull(graph, URIs.Vertex_HasPeakPower);
+        Vertex_HasPeakPower_Inverse = getResourceOrNull(graph, URIs.Vertex_HasPeakPower_Inverse);
         Vertex_HasPumpInReturnLine = getResourceOrNull(graph, URIs.Vertex_HasPumpInReturnLine);
         Vertex_HasPumpInReturnLine_Inverse = getResourceOrNull(graph, URIs.Vertex_HasPumpInReturnLine_Inverse);
         Vertex_HasPumpMassFlowNominal = getResourceOrNull(graph, URIs.Vertex_HasPumpMassFlowNominal);