X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2FDistrictNetworkUtil.java;h=bac4707d87cc8fe627e0d24f2604503a2fc6d22d;hb=af46ba24e2d2b6e68f62e5e215386166fa456d98;hp=821085175a91886b25807fde8d30133b805b3ca3;hpb=404106a6a8c09ce3f320e8831894f4fe399662fc;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
index 82108517..bac4707d 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
@@ -4,9 +4,13 @@ import java.util.Collection;
 import java.util.Iterator;
 
 import org.simantics.databoard.Bindings;
+import org.simantics.datatypes.literal.RGB;
+import org.simantics.datatypes.literal.RGB.Integer;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
+import org.simantics.db.common.procedure.adapter.TransientCacheListener;
+import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.common.utils.OrderedSetUtils;
 import org.simantics.db.exception.BindingException;
 import org.simantics.db.exception.DatabaseException;
@@ -25,11 +29,11 @@ import org.simantics.operation.Layer0X;
 
 public class DistrictNetworkUtil {
 
-    public static Resource createEdge(WriteGraph graph, Resource composite) throws DatabaseException {
-        return createEdge(graph, composite, graph.getPossibleObject(composite, DistrictNetworkResource.getInstance(graph).EdgeDefaultMapping));
+    public static Resource createEdge(WriteGraph graph, Resource composite, double[] detailedGeometryCoords) throws DatabaseException {
+        return createEdge(graph, composite, graph.getPossibleObject(composite, DistrictNetworkResource.getInstance(graph).EdgeDefaultMapping), detailedGeometryCoords);
     }
 
-    public static Resource createEdge(WriteGraph graph, Resource composite, Resource mapping) throws DatabaseException {
+    public static Resource createEdge(WriteGraph graph, Resource composite, Resource mapping, double[] detailedGeometryCoords) throws DatabaseException {
         Layer0 L0 = Layer0.getInstance(graph);
         DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
         if (mapping == null) {
@@ -39,7 +43,7 @@ public class DistrictNetworkUtil {
         Resource edge = graph.newResource();
         graph.claim(edge, L0.InstanceOf, DN.Edge);
         
-        graph.claim(edge, DN.HasMapping, mapping);
+        graph.claim(edge, DN.HasMapping, null, mapping);
         
         OrderedSetUtils.addFirst(graph, composite, edge);
         graph.claim(composite, L0.ConsistsOf, L0.PartOf, edge);
@@ -56,23 +60,26 @@ public class DistrictNetworkUtil {
             });
         }
         
+        // add detailed geometry (if any)
+        graph.claimLiteral(edge, DN.Edge_HasGeometry, detailedGeometryCoords, Bindings.DOUBLE_ARRAY);
         return edge;
     }
 
-    public static Resource createVertex(WriteGraph graph, Resource composite, double[] coords) throws DatabaseException {
+    public static Resource createVertex(WriteGraph graph, Resource composite, double[] coords, double elevation) throws DatabaseException {
         Resource defaultVertexMapping = graph.getPossibleObject(composite, DistrictNetworkResource.getInstance(graph).VertexDefaultMapping);
-        return createVertex(graph, composite, coords, defaultVertexMapping);
+        return createVertex(graph, composite, coords, elevation, defaultVertexMapping);
     }
 
-    public static Resource createVertex(WriteGraph graph, Resource composite, double[] coords, Resource mapping) throws DatabaseException {
+    public static Resource createVertex(WriteGraph graph, Resource composite, double[] coords, double elevation, Resource mapping) throws DatabaseException {
         Layer0 L0 = Layer0.getInstance(graph);
         DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
         DiagramResource DIA = DiagramResource.getInstance(graph);
         Resource vertex = graph.newResource();
         graph.claim(vertex, L0.InstanceOf, DN.Vertex);
         graph.claimLiteral(vertex, DIA.HasLocation, coords);
+        graph.claimLiteral(vertex, DN.Vertex_HasElevation, elevation, Bindings.DOUBLE);
         
-        graph.claim(vertex, DN.HasMapping, mapping);
+        graph.claim(vertex, DN.HasMapping, null, mapping);
         
         OrderedSetUtils.add(graph, composite, vertex);
         graph.claim(composite, L0.ConsistsOf, L0.PartOf, vertex);
@@ -179,6 +186,10 @@ public class DistrictNetworkUtil {
         ModelingResources MOD = ModelingResources.getInstance(graph);
         return graph.getPossibleObject(mappedElement, MOD.ElementToComponent);
     }
+    
+    public static Resource getMappedComponentCached(ReadGraph graph, Resource vertex) throws DatabaseException {
+        return graph.syncRequest(new MappedComponentRequest(vertex), TransientCacheListener.instance());
+    }
 
     public static Resource getMappedDNElement(ReadGraph graph, Resource element) throws DatabaseException {
         if (element == null)
@@ -220,4 +231,36 @@ public class DistrictNetworkUtil {
         Boolean current = graph.getPossibleRelatedValue(diagram, DN.Diagram_drawMapEnabled, Bindings.BOOLEAN);
         return current != null ? current : true;
     }
+
+    public static void changeMapBackgroundColor(WriteGraph graph, Resource diagram, Integer integer) throws DatabaseException {
+        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+        graph.claimLiteral(diagram, DN.Diagram_backgroundColor, integer, Bindings.getBindingUnchecked(RGB.Integer.class));
+    }
+    
+    public static Boolean trackChangesEnabled(ReadGraph graph, Resource diagram) throws DatabaseException {
+        if (diagram != null && graph.hasStatement(diagram)) {
+            return Boolean.TRUE.equals(graph.getPossibleRelatedValue(diagram,
+                DistrictNetworkResource.getInstance(graph).Diagram_trackChangesEnabled));
+        } else {
+            return false;
+        }
+    }
+
+    public static RGB.Integer backgroundColor(ReadGraph graph, Resource diagram) throws DatabaseException {
+        return graph.getPossibleRelatedValue(diagram,
+                DistrictNetworkResource.getInstance(graph).Diagram_backgroundColor,
+                Bindings.getBindingUnchecked(RGB.Integer.class));
+    }
+
+    public static final class MappedComponentRequest extends ResourceRead<Resource> {
+        public MappedComponentRequest(Resource element) {
+            super(element);
+        }
+
+        @Override
+        public Resource perform(ReadGraph graph) throws DatabaseException {
+            return getMappedComponent(graph, resource);
+        }
+    }
+
 }