X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=5e17f658ed8f2cc0a3d5b454e11840d8ae7f62aa;hb=refs%2Fchanges%2F01%2F401%2F1;hp=ade6b1c5992bd63011cc5eabe4119e56b71e8e46;hpb=16ee01dc5a40981c58fd5b478b89552e5814e8bb;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 ade6b1c5..5e17f658 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -15,12 +15,10 @@ 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.HasMapping DN.Mapping.Dummy
     @L0.assert DN.Bidirectional false
     @L0.assert DN.Edge.HasDiameter 1
 
 DN.Vertex <T DIA.Element : L0.Type
-    @L0.assert DN.HasMapping DN.Mapping.Dummy
     @L0.assert DN.Bidirectional false
 
 DN.Bidirectional <R L0.HasProperty : SEL.GenericParameterType
@@ -71,15 +69,15 @@ DN.HasInLayerTag <R L0.HasProperty
 
 DN.Connection <T DIA.Connection
 
-DN.Mapping.Dummy : DN.Mapping.Base
+DN.Diagram.MappedDiagram <R L0.IsWeaklyRelatedTo
+DN.MappedComponent <R L0.IsWeaklyRelatedTo
 
 DN.Diagram <T DIA.Diagram
-    @L0.assert DN.VertexDefaultMapping DN.Mapping.Dummy
-    @L0.assert DN.EdgeDefaultMapping DN.Mapping.Dummy
 
 DN.AddLayerToDNDiagramTemplate <T L0.Template
 
-DN.EPSG_4326 <T DN.SpatialRefSystem
+DN.EPSG_4326 : DN.SpatialRefSystem
+    L0.HasLabel "EPSG:4326"
     DN.HasSRID 4326
     DN.HasSRTEXT _ : L0.String
         @L0.loadString "epsg/EPSG_4326"
@@ -129,13 +127,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
@@ -146,8 +145,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