From 4380c088a10c1caae9fb3202f0a940ffdea81bc1 Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Mon, 12 Oct 2020 10:16:21 +0300
Subject: [PATCH] Adding new mappable attributes for vertices and edges

gitlab #102

Change-Id: Ieaf033fc34f28c00683f624f730ce7a7ca95470a
(cherry picked from commit bc3098a132f1fea7f5e9b6feedf6e2ca9ff59525)
(cherry picked from commit ed3ef92c8120037c1b81cd2880c0ee78c6b4427c)
---
 .../graph/DistrictNetwork.pgraph              | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 7c205df8..1fc0efa7 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -47,6 +47,8 @@ DN.Connection <T DIA.Connection
 DN.Element <T DIA.Element : L0.Type
 
 DN.Vertex <T DN.Element
+    >-- DN.Vertex.HasDiameter
+        @defProperty "Diameter" L0.Double
     >-- DN.Vertex.HasElevation
         @defProperty "Elevation" L0.Double
     >-- DN.Vertex.HasAltElevation
@@ -64,7 +66,9 @@ DN.Vertex <T DN.Element
     >-- DN.Vertex.HasDeltaPressure
         @defProperty "Delta pressure" L0.Double 
     >-- DN.Vertex.HasDeltaTemperature
-        @defProperty "Delta temperature" L0.Double 
+        @defProperty "Delta temperature" L0.Double
+    >-- DN.Vertex.HasNominalDT
+        @defProperty "Nominal DT" L0.Double
     >-- DN.Vertex.HasHeatPower
         @defProperty "Heat Power" L0.Double
     >-- DN.Vertex.HasPeakPower
@@ -111,6 +115,12 @@ DN.Vertex <T DN.Element
         @defProperty "Pump Speed Max" L0.Double
     >-- DN.Vertex.HasPumpSpeedMin
         @defProperty "Pump Speed Min" L0.Double
+    >-- DN.Vertex.HasPumpSupplyOn
+        @defProperty "Pump Supply On" L0.Boolean
+    >-- DN.Vertex.HasPumpReturnOn
+        @defProperty "Pump Return On" L0.Boolean
+    >-- DN.Vertex.HasPumpInSupplyLine
+        @defProperty "Pump In Supply Line" L0.Boolean
     >-- DN.Vertex.HasValveReturnLine
         @defProperty "Valve Return Line" L0.Double
     >-- DN.Vertex.HasValveMeMax
@@ -434,6 +444,8 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
         DN.Mapping.HasPropertyRelation DN.Vertex.HasDeltaTemperature
     >-- DN.Mapping.VertexMapping.XAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.YAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.DiameterAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasDiameter
     // Production
     >-- DN.Mapping.VertexMapping.dpAttribute --> L0.String <R L0.HasProperty
         DN.Mapping.HasPropertyRelation DN.Vertex.HasDeltaPressure
@@ -480,6 +492,8 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
         DN.Mapping.HasPropertyRelation DN.Vertex.HasFrequencyConverterControlled
     >-- DN.Mapping.VertexMapping.InternalValveMeasurementAttribute --> L0.String <R L0.HasProperty
         DN.Mapping.HasPropertyRelation DN.Vertex.HasInternalValveMeasurement
+    >-- DN.Mapping.VertexMapping.PumpInSupplyLineAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpInSupplyLine
     >-- DN.Mapping.VertexMapping.PumpInReturnLineAttribute --> L0.String <R L0.HasProperty
         DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpInReturnLine
     >-- DN.Mapping.VertexMapping.PumpMassFlowNominalAttribute --> L0.String <R L0.HasProperty
@@ -504,7 +518,13 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
         DN.Mapping.HasPropertyRelation DN.Vertex.HasValveOutletMode
     >-- DN.Mapping.VertexMapping.ValvePressLossNominalAttribute --> L0.String <R L0.HasProperty
         DN.Mapping.HasPropertyRelation DN.Vertex.HasValvePressLossNominal
-
+    >-- DN.Mapping.VertexMapping.PumpSupplyOnAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpSupplyOn
+    >-- DN.Mapping.VertexMapping.PumpReturnOnAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpReturnOn
+    >-- DN.Mapping.VertexMapping.NominalDTAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasNominalDT
+    
     // valve
     >-- DN.Mapping.VertexMapping.OpeningTimeAttribute --> L0.String <R L0.HasProperty
         DN.Mapping.HasPropertyRelation DN.Vertex.HasOpeningTime
@@ -546,6 +566,10 @@ DN.Mapping.EdgeMapping <T DN.Mapping.Base
         DN.Mapping.HasPropertyRelation DN.Edge.HasStructure
     >-- DN.Mapping.EdgeMapping.InsulationClassAttribute --> L0.String <R L0.HasProperty
         DN.Mapping.HasPropertyRelation DN.Edge.HasInsulationClass
+    >-- DN.Mapping.EdgeMapping.ConductanceAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasConductance
+    >-- DN.Mapping.EdgeMapping.ConductivityAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasConductance
 
 // Allowed connection types
 DN.SupplyConnectionType <T STR.ConnectionType
-- 
2.47.1