From: jsimomaa <jani.simomaa@gmail.com>
Date: Mon, 12 Oct 2020 07:49:38 +0000 (+0300)
Subject: Adding new mappable attributes for vertices and edges
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F4570%2F1;p=simantics%2Fdistrict.git

Adding new mappable attributes for vertices and edges

Remove duplicate mapping for DN.Edge.HasConductance

gitlab #102

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

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 1fc0efa7..839b54b1 100644
--- 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