Make vertices smaller on map UI & CSV import performance improvements

[simantics/district.git] / org.simantics.district.network / src / org / simantics / district / network / DistrictNetworkUtil.java

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 fd72a67378b62609f3061284aca2528723a78512..fde334f770d89d7a68cdfe84361692b62bcbf5ba 100644 (file)
--- a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
@@ -9,6 +9,8 @@ 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;
@@ -61,18 +63,19 @@ public class DistrictNetworkUtil {
         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, null, mapping);
         
@@ -181,6 +184,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)
@@ -242,4 +249,16 @@ public class DistrictNetworkUtil {
                 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);
+        }
+    }
+
 }