Fix variable exceptions for certain properties in district diagram

[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 d258b9261acc8509d4f4fe5001addd69aea9f16b..64c1b6cd8328f9ad63218bb7a28ef2d953c8b10b 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -159,13 +159,13 @@ DN.AddLayerToDNDiagramTemplate <T L0.Template
 DN.EPSG_4326 : DN.SpatialRefSystem
     L0.HasLabel "EPSG:4326"
     DN.HasSRID 4326
-    DN.HasSRTEXT _ : L0.String
-        @L0.loadString "epsg/EPSG_4326"
 
-DN.SpatialRefSystem <T L0.Entity
+DN.SpatialRefSystem <T L0.Property
+    L0.readOnly true
 
-DN.HasSpatialRefSystem <R L0.HasProperty
+DN.HasSpatialRefSystem <R L0.HasProperty : SEL.GenericParameterType
     L0.HasRange DN.SpatialRefSystem
+    L0.HasLabel "Spatial Reference System"
 
 DN.HasSRID <R L0.HasProperty
     L0.HasRange L0.Integer
@@ -201,18 +201,20 @@ DN.Mapping <T L0.Library
 DN.Functions.convertToValue : L0.ExternalValue
 
 DN.Mapping.Base <T L0.Value
+  >-- DN.Mapping.Id --> L0.String <R L0.HasProperty
+  >-- DN.Mapping.ComponentType --> STR.ComponentType <R L0.DependsOn
+  >-- DN.Mapping.Terminals --> DN.Mapping.TerminalPair <R L0.HasProperty
   @L0.assert L0.ConvertsToValueWith DN.Functions.convertToValue
 
 DN.Mapping.Terminal <T L0.Entity
+    L0.HasRange L0.String
 
-DN.Mapping.TerminalPair <T L0.Entity
+DN.Mapping.TerminalPair <T L0.Property
     >-- DN.Mapping.InputTerminal --> DN.Mapping.Terminal <R L0.HasProperty
     >-- DN.Mapping.OutputTerminal --> DN.Mapping.Terminal <R L0.HasProperty
 
 DN.Mapping.VertexMapping <T DN.Mapping.Base
     // Common
-    >-- DN.Mapping.Id --> L0.String <R L0.HasProperty
-    >-- DN.Mapping.ComponentType --> STR.ComponentType <R L0.DependsOn
     >-- DN.Mapping.VertexMapping.ElevationAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.SupplyTemperatureAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.ReturnTemperatureAttribute --> L0.String <R L0.HasProperty
@@ -222,7 +224,6 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
     >-- DN.Mapping.VertexMapping.DeltaTemperatureAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.XAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.YAttribute --> L0.String <R L0.HasProperty
-    >-- DN.Mapping.Terminals --> DN.Mapping.TerminalPair <R L0.HasProperty
     // Production
     >-- DN.Mapping.VertexMapping.dpAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.dtAttribute --> L0.String <R L0.HasProperty
@@ -243,8 +244,6 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
     >-- DN.Mapping.VertexMapping.NominalMassFlowAttribute --> L0.String <R L0.HasProperty
 
 DN.Mapping.EdgeMapping <T DN.Mapping.Base
-    >-- DN.Mapping.Id
-    >-- DN.Mapping.ComponentType
     >-- DN.Mapping.EdgeMapping.LengthAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.DiameterAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.OuterDiameterAttribute --> L0.String <R L0.HasProperty
@@ -254,4 +253,3 @@ DN.Mapping.EdgeMapping <T DN.Mapping.Base
     >-- DN.Mapping.EdgeMapping.KSupplyAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.TGroundAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.ElevationAttribute --> L0.String <R L0.HasProperty
-    >-- DN.Mapping.Terminals