X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;fp=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=2a64b3dc15ba566b838cb17487c0869c5b8be820;hb=797e65f69a2bd674f8fc4dcc16bcd11e2cf49ca3;hp=aa801f0874b825f4a1834cd3fe43b850b1867cad;hpb=899b77b837b4473c0176dc9eb1b67e632b98db25;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index aa801f08..2a64b3dc 100644
--- 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