]> gerrit.simantics Code Review - simantics/district.git/commitdiff
Code Review / simantics / district.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 4380c08)
Adding new mappable attributes for vertices and edges 70/4570/1
authorjsimomaa <jani.simomaa@gmail.com>
Mon, 12 Oct 2020 07:49:38 +0000 (10:49 +0300)
committerJani Simomaa <jani.simomaa@semantum.fi>
Wed, 4 Nov 2020 13:01:45 +0000 (13:01 +0000)
Remove duplicate mapping for DN.Edge.HasConductance

gitlab #102

Change-Id: Ibbdd3192fab8bf7ba43aa0ea71cb0b749263d097
(cherry picked from commit 5fa14d5ab4da2e161a75b75e324e6253ba49cbc4)
(cherry picked from commit 782045a8c4f27b1dbdc77d620437aef28cd77b97)

org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph patch | blob | history

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 1fc0efa7acc144f0cb44807de65e6539df8f8bb1..839b54b183688560414de51948cefeb0b00599a2 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -568,8 +568,6 @@ DN.Mapping.EdgeMapping <T DN.Mapping.Base
         DN.Mapping.HasPropertyRelation DN.Edge.HasInsulationClass
     >-- DN.Mapping.EdgeMapping.ConductanceAttribute --> L0.String <R L0.HasProperty
         DN.Mapping.HasPropertyRelation DN.Edge.HasConductance
-    >-- DN.Mapping.EdgeMapping.ConductivityAttribute --> L0.String <R L0.HasProperty
-        DN.Mapping.HasPropertyRelation DN.Edge.HasConductance
 
 // Allowed connection types
 DN.SupplyConnectionType <T STR.ConnectionType
Simantics District Modelling components.