X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=a4144a808f895333c6ef14b09fd21fb8bc564048;hb=refs%2Fchanges%2F16%2F616%2F1;hp=5c30822b1f856c9cbcc8d79611a23f619f9938cc;hpb=55f42e7fcc2f6733082ab8c150efe3a2b54ff22b;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 5c30822b..a4144a80 100644
--- 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
@@ -69,6 +74,9 @@ DN.HasInLayerTag <R L0.HasProperty
 
 DN.Connection <T DIA.Connection
 
+DN.Diagram.MappedDiagram <R L0.IsWeaklyRelatedTo
+DN.MappedComponent <R L0.IsWeaklyRelatedTo
+
 DN.Diagram <T DIA.Diagram
 
 DN.AddLayerToDNDiagramTemplate <T L0.Template
@@ -124,13 +132,14 @@ DNAC.newDiagramContribution : L0.Template
 
 DNAC = DN.ActionContext : VP.BrowseContext
     VP.BrowseContext.IsIncludedIn MOD.ModelingActionContext
-    @DNAC.newDiagramContribution "DN Diagram" IMAGES.ConfigurationFolder ACTIONS.NewDNDiagram
+    @DNAC.newDiagramContribution "Network Diagram" IMAGES.MapImage ACTIONS.NewDNDiagram
 
 DNBC = DN.BrowseContext : VP.BrowseContext
     VP.BrowseContext.IsIncludedIn MOD.ModelingBrowseContext
     VP.BrowseContext.Includes SEL_UI.StandardPropertiesBase.BrowseContext
     
     @VP.customModifierRule    DN.Edge    VP.ResourceLabelModifierRule
+    @VP.constantImageRule     DN.Composite   IMAGES.MapImage
 
 
 ACTIONS = DN.Actions : L0.Library
@@ -141,8 +150,8 @@ ACTIONS.NewDNDiagram : MOD.NewComposite
 
 IMAGES = DN.Images : L0.Library
 
-IMAGES.ConfigurationFolder : IMAGE.PngImage
-    @L0.loadBytes "images/Configuration.png"
+IMAGES.MapImage : IMAGE.PngImage
+    @L0.loadBytes "images/map.png"
 
 // Component MAPPING
 DN.Mapping <T L0.Library
@@ -165,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