From: jsimomaa <jani.simomaa@gmail.com>
Date: Sun, 2 Sep 2018 21:29:28 +0000 (+0300)
Subject: Add MappedComponent and remove HasSolverRVI
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=f2ed416a826b3d24d7bffe41563a202d1be78bda;p=simantics%2Fdistrict.git

Add MappedComponent and remove HasSolverRVI

gitlab #7

Change-Id: I53ab1801acf719a483d7d45de6eaadeb26a13527
---

diff --git a/org.simantics.district.network.ontology/graph.tg b/org.simantics.district.network.ontology/graph.tg
index dcc422bf..fc089f4a 100644
Binary files a/org.simantics.district.network.ontology/graph.tg and b/org.simantics.district.network.ontology/graph.tg differ
diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index b7b5d043..8b42129c 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -56,11 +56,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 +205,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
 
diff --git a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
index d23f9d0c..5859e2fd 100644
--- a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
+++ b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
@@ -69,8 +69,6 @@ public class DistrictNetworkResource {
     public final Resource HasSRID_Inverse;
     public final Resource HasSRTEXT;
     public final Resource HasSRTEXT_Inverse;
-    public final Resource HasSolverRVI;
-    public final Resource HasSolverRVI_Inverse;
     public final Resource HasSpatialRefSystem;
     public final Resource HasSpatialRefSystem_Inverse;
     public final Resource HasStartVertex;
@@ -266,8 +264,6 @@ public class DistrictNetworkResource {
         public static final String HasSRID_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasSRID/Inverse";
         public static final String HasSRTEXT = "http://www.simantics.org/DistrictNetwork-1.0/HasSRTEXT";
         public static final String HasSRTEXT_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasSRTEXT/Inverse";
-        public static final String HasSolverRVI = "http://www.simantics.org/DistrictNetwork-1.0/HasSolverRVI";
-        public static final String HasSolverRVI_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasSolverRVI/Inverse";
         public static final String HasSpatialRefSystem = "http://www.simantics.org/DistrictNetwork-1.0/HasSpatialRefSystem";
         public static final String HasSpatialRefSystem_Inverse = "http://www.simantics.org/DistrictNetwork-1.0/HasSpatialRefSystem/Inverse";
         public static final String HasStartVertex = "http://www.simantics.org/DistrictNetwork-1.0/HasStartVertex";
@@ -473,8 +469,6 @@ public class DistrictNetworkResource {
         HasSRID_Inverse = getResourceOrNull(graph, URIs.HasSRID_Inverse);
         HasSRTEXT = getResourceOrNull(graph, URIs.HasSRTEXT);
         HasSRTEXT_Inverse = getResourceOrNull(graph, URIs.HasSRTEXT_Inverse);
-        HasSolverRVI = getResourceOrNull(graph, URIs.HasSolverRVI);
-        HasSolverRVI_Inverse = getResourceOrNull(graph, URIs.HasSolverRVI_Inverse);
         HasSpatialRefSystem = getResourceOrNull(graph, URIs.HasSpatialRefSystem);
         HasSpatialRefSystem_Inverse = getResourceOrNull(graph, URIs.HasSpatialRefSystem_Inverse);
         HasStartVertex = getResourceOrNull(graph, URIs.HasStartVertex);