X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FDNEdgeBuilder.java;h=0df72c517f533f79e89dbee085b64819ec76cb9f;hb=refs%2Fchanges%2F65%2F2165%2F1;hp=0270fea0277eaa0c799fb8556a4367bc50e6c578;hpb=8f01541a004001e73fb67508e166067c9ec6d44c;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DNEdgeBuilder.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DNEdgeBuilder.java
index 0270fea0..0df72c51 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DNEdgeBuilder.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DNEdgeBuilder.java
@@ -9,16 +9,16 @@ import org.simantics.databoard.Bindings;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.ObjectsWithType;
+import org.simantics.db.exception.BindingException;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.exception.ManyObjectsForFunctionalRelationException;
+import org.simantics.db.exception.ServiceException;
 import org.simantics.db.layer0.util.Layer0Utils;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.diagram.synchronization.IModifiableSynchronizationContext;
 import org.simantics.diagram.synchronization.SynchronizationHints;
-import org.simantics.diagram.synchronization.graph.DiagramGraphUtil;
 import org.simantics.diagram.synchronization.graph.GraphSynchronizationHints;
-import org.simantics.diagram.synchronization.graph.layer.GraphLayer;
 import org.simantics.diagram.synchronization.graph.layer.GraphLayerManager;
-import org.simantics.diagram.synchronization.graph.layer.IGraphLayerUtil;
 import org.simantics.district.network.DistrictNetworkUtil;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.g2d.diagram.IDiagram;
@@ -45,10 +45,10 @@ public class DNEdgeBuilder {
             double[] existingCoords = graph.getRelatedValue2(vertex, DiagramResource.getInstance(graph).HasLocation, Bindings.DOUBLE_ARRAY);
             vv.add(new ResourceVertex(vertex, existingCoords));
         }
-        return create(graph, vv, diagramResource, null, start, end, padding);
+        return create(graph, vv, diagramResource, null, start, end, padding, false);
     }
     
-    public static Resource create(WriteGraph graph, Collection<ResourceVertex> vertices, Resource diagramResource, Resource mapping, double[] start, double[] end, double padding) throws DatabaseException {
+    public static Resource create(WriteGraph graph, Collection<ResourceVertex> vertices, Resource diagramResource, Resource mapping, double[] start, double[] end, double padding, boolean writeElevationToEdgeFromPoints) throws DatabaseException {
         
         DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
         
@@ -58,6 +58,9 @@ public class DNEdgeBuilder {
         // 2. Add vertices
         Resource startVertex = getOrCreateVertex(graph, diagramResource, vertices, start, padding, null);
         Resource endVertex = getOrCreateVertex(graph, diagramResource, vertices, end, padding, startVertex);
+        if (writeElevationToEdgeFromPoints) {
+            graph.claimLiteral(edge, DN.Edge_HasElevation, calculateElevationFromVertices(graph, startVertex, endVertex), Bindings.DOUBLE);
+        }
         
         graph.claim(edge, DN.HasStartVertex, startVertex);
         graph.claim(edge, DN.HasEndVertex, endVertex);
@@ -75,6 +78,16 @@ public class DNEdgeBuilder {
 //        
         return edge;
     }
+    private static double calculateElevationFromVertices(WriteGraph graph, Resource startVertex, Resource endVertex) throws ManyObjectsForFunctionalRelationException, BindingException, ServiceException {
+        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+        Double startElevation = graph.getPossibleRelatedValue(startVertex, DN.Vertex_HasElevation, Bindings.DOUBLE);
+        Double endElevation = graph.getPossibleRelatedValue(endVertex, DN.Vertex_HasElevation, Bindings.DOUBLE);
+        if (startElevation != null && endElevation != null) {
+            return (startElevation + endElevation) / 2;
+        }
+        return 0;
+    }
+
     public void create(WriteGraph graph,  double[] start, double[] end, double padding) throws DatabaseException {
         
         Resource edge = create(graph, diagramResource, start, end, padding);