Final push of district changes

[simantics/district.git] / org.simantics.district.network.ontology / graph / DistrictNetwork.pgraph

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 5e17f658ed8f2cc0a3d5b454e11840d8ae7f62aa..a4144a808f895333c6ef14b09fd21fb8bc564048 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -15,16 +15,11 @@ DN = <http://www.simantics.org/DistrictNetwork-1.0> : L0.Ontology
 DN.Layer <T DIA.Layer
 
 DN.Edge <T DIA.Element : L0.Type
-    @L0.assert DN.Bidirectional false
-    @L0.assert DN.Edge.HasDiameter 1
+    @L0.assert DN.Edge.HasDiameter 0.1
+    @L0.assert DN.Edge.HasOuterDiameter 0.11
 
 DN.Vertex <T DIA.Element : L0.Type
-    @L0.assert DN.Bidirectional false
-
-DN.Bidirectional <R L0.HasProperty : SEL.GenericParameterType
-    L0.HasLabel "Is network bidirectional"
-    L0.HasRange L0.Boolean
-    L0.readOnly false
+    @L0.assert DN.Vertex.HasElevation 0.0
 
 DN.EdgeDefaultMapping <R L0.HasProperty : DN.EdgeMappingParameterType
     L0.HasLabel "Default Edge mapping"
@@ -60,6 +55,16 @@ DN.Edge.HasDiameter <R L0.HasProperty : SEL.GenericParameterType
     L0.HasRange L0.Double
     L0.readOnly false
 
+DN.Vertex.HasElevation <R L0.HasProperty : SEL.GenericParameterType
+    L0.HasLabel "Elevation"
+    L0.HasRange L0.Double
+    L0.readOnly false
+
+DN.Edge.HasOuterDiameter <R L0.HasProperty : SEL.GenericParameterType
+    L0.HasLabel "Outer Diameter"
+    L0.HasRange L0.Double
+    L0.readOnly false
+
 DN.InLayer
     @L0.defTag 
     @L0.tag L0.Abstract
@@ -169,7 +174,6 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
 
 DN.Mapping.EdgeMapping <T DN.Mapping.Base
     >-- DN.Mapping.ComponentType
-    >-- DN.Mapping.EdgeMapping.Bidirectional --> L0.Boolean <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.LengthAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.DiameterAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.Terminals