Added DN.Element as base type for DH diagram elements

[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 b7b5d04363a98ec220d847f4724db592971f86c7..435bd55d9813e30a19bb8ab66e0ae8c26342d26a 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -15,11 +15,13 @@ DN = <http://www.simantics.org/DistrictNetwork-1.0> : L0.Ontology
 
 DN.Layer <T DIA.Layer
 
-DN.Edge <T DIA.Element : L0.Type
+DN.Element <T DIA.Element : L0.Type
+
+DN.Edge <T DN.Element
     @L0.assert DN.Edge.HasDiameter 0.1
     @L0.assert DN.Edge.HasOuterDiameter 0.11
 
-DN.Vertex <T DIA.Element : L0.Type
+DN.Vertex <T DN.Element
     @L0.assert DN.Vertex.HasElevation 0.0
 
 DN.EdgeDefaultMapping <R L0.HasProperty : DN.EdgeMappingParameterType
@@ -56,11 +58,6 @@ DN.HasId <R L0.HasProperty : SEL.GenericParameterType
     L0.HasRange L0.String
     L0.readOnly false
 
-DN.HasSolverRVI <R L0.HasProperty
-    L0.HasLabel "Solver RVI"
-    L0.HasRange L0.String
-    L0.readOnly true
-
 DN.Vertex.HasElevation <R L0.HasProperty : SEL.GenericParameterType
     L0.HasLabel "Elevation"
     L0.HasRange L0.Double
@@ -210,8 +207,11 @@ DN.HasInLayerTag <R L0.HasProperty
 
 DN.Connection <T DIA.Connection
 
+// For associating typical diagram source and instance structures with each other
 DN.Diagram.MappedDiagram <R L0.IsWeaklyRelatedTo
+    L0.InverseOf DN.Diagram.MappedFromDiagram <R L0.IsWeaklyRelatedTo
 DN.MappedComponent <R L0.IsWeaklyRelatedTo
+    L0.InverseOf DN.MappedFromElement <R L0.IsWeaklyRelatedTo
 
 DN.Diagram <T DIA.Diagram
 
@@ -372,7 +372,7 @@ DN.DistrictProfile : DIA.Profile
 DN.Groups : L0.Library
 
 DN.Groups.ElementGroup : DIA.TypeGroup
-  DIA.TypeGroup.HasType DIA.Element
+  DIA.TypeGroup.HasType DN.Element
 
 DN.ComponentNameStyle : DIA.ResourceSCLTextGridStyle
     @MOD.scl DIA.ResourceSCLTextGridStyle.texts