Some fixes to district stuff

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / function / Functions.java

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java
index 7ae651342eca629bd3f33266d90da798fc0a0050..f421c6735e5f48ea642894512d18442ce27d942c 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java
@@ -32,6 +32,7 @@ import org.simantics.db.Resource;
 import org.simantics.db.Session;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.IndexRoot;
+import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
@@ -40,6 +41,7 @@ import org.simantics.db.exception.ServiceException;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.Variables.Role;
 import org.simantics.db.procedure.Procedure;
+import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;
@@ -94,11 +96,19 @@ public class Functions {
     }
 
     public static Map<String, Resource> getVertexMappings(ReadGraph graph, Resource resource) throws DatabaseException {
-        return getNetworkMappingsByType(graph, resource , DistrictNetworkResource.getInstance(graph).Mapping_VertexMapping);
+        Map<String, Resource> second = getNetworkMappingsByType(graph, resource , DistrictNetworkResource.getInstance(graph).Mapping_VertexMapping);
+        return second;
     }
 
     public static Map<String, Resource> getEdgeMappings(ReadGraph graph, Resource resource) throws DatabaseException {
-        return getNetworkMappingsByType(graph, resource , DistrictNetworkResource.getInstance(graph).Mapping_EdgeMapping);
+        Map<String, Resource> second = getNetworkMappingsByType(graph, resource , DistrictNetworkResource.getInstance(graph).Mapping_EdgeMapping);
+        return second;
+    }
+    
+    public static Map<String, Resource> getCRSs(ReadGraph graph, Resource resource) throws DatabaseException {
+        Map<String, Resource> result = getNetworkMappingsByType(graph, resource, DistrictNetworkResource.getInstance(graph).SpatialRefSystem);
+        return result;
+        
     }
 
     public static Map<String, Resource> getNetworkMappingsByType(ReadGraph graph, Resource element, Resource mappingType) throws DatabaseException {
@@ -196,10 +206,13 @@ public class Functions {
         private Map<String, Resource> vertexMappings = new HashMap<>();
         private Map<String, Resource> edgeMappings = new HashMap<>();
         private Map<String, Resource> composites = new HashMap<>();
+        private Map<String, Resource> crss = new HashMap<>();
         private Map<String, Map<String, Resource>> components = new HashMap<>();
         
         private Resource defaultVertexMapping;
         private Resource defaultEdgeMapping;
+        private Resource defaultCRS;
+        
         private Combo compositeMappingCombo;
         private Combo componentMappingCombo;
 
@@ -239,14 +252,21 @@ public class Functions {
                         components = getComponents(graph, composites.get(0));
                     }
                     
+                    crss = getCRSs(graph, configuration);
                     
                     composite.getDisplay().asyncExec(() -> {
                         
                         vertexMappingCombo.setItems(vertexMappings.keySet().toArray(new String[vertexMappings.size()]));
                         edgeMappingCombo.setItems(edgeMappings.keySet().toArray(new String[edgeMappings.size()]));
+                        
+                        crsCombo.setItems(crss.keySet().toArray(new String[crss.size()]));
+                        
                         compositeMappingCombo.setItems(composites.keySet().toArray(new String[composites.size()]));
                         vertexMappingCombo.select(0);
                         edgeMappingCombo.select(0);
+                        
+                        crsCombo.select(0);
+                        
                         if (!composites.isEmpty())
                             compositeMappingCombo.select(0);
                     }); 
@@ -262,9 +282,11 @@ public class Functions {
         }
 
         protected Map<String, Resource> getComposites(ReadGraph graph, Resource element) throws DatabaseException {
+            
             Resource indexRoot = graph.sync(new IndexRoot(element));
-            List<Resource> composites = ModelingUtils.searchByType(graph, indexRoot, StructuralResource2.getInstance(graph).Composite);
-            List<Resource> nonDistrictComposites = composites.stream().filter(comp -> {
+            List<Resource> diagrams = ModelingUtils.searchByType(graph, indexRoot, DiagramResource.getInstance(graph).Diagram);
+            
+            List<Resource> nonDistrictComposites = composites.values().stream().filter(comp -> {
                 try {
                     return !graph.isInstanceOf(comp, DistrictNetworkResource.getInstance(graph).Composite);
                 } catch (ServiceException e1) {
@@ -279,7 +301,7 @@ public class Functions {
                     String name = graph.getRelatedValue2(mapping, L0.HasName);
                     result.put(name, mapping);
                 } catch (DatabaseException e) {
-                    e.printStackTrace();
+                    LOGGER.error("Could not read name of " + mapping, e);
                 }
             });
             return result;
@@ -379,6 +401,11 @@ public class Functions {
         protected void computeResult() {
             defaultVertexMapping = vertexMappings.get(vertexMappingCombo.getItem(vertexMappingCombo.getSelectionIndex()));
             defaultEdgeMapping = edgeMappings.get(edgeMappingCombo.getItem(edgeMappingCombo.getSelectionIndex()));
+            defaultCRS = crss.get(crsCombo.getItem(crsCombo.getSelectionIndex()));
+        }
+
+        public Resource getCRS() {
+            return defaultCRS;
         }
         
     }
@@ -404,6 +431,7 @@ public class Functions {
                                 Resource diagram = graph.getSingleObject(composite, ModelingResources.getInstance(graph).CompositeToDiagram);
                                 graph.claim(diagram, DN.EdgeDefaultMapping, dialog.getDefaultEdgeMapping());
                                 graph.claim(diagram, DN.VertexDefaultMapping, dialog.getDefaultVertexMapping());
+                                graph.claim(diagram, DN.HasSpatialRefSystem, dialog.getCRS());
                             }
                         });
                         DefaultActions.asyncPerformDefaultAction(Simantics.getSession(), composite, false, false, true);