Add support for setting pipeType from CSV import

gitlab #80

Change-Id: I4a98493466629697dd535814749d35a708a24a95

diff --git a/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java b/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java
index 1acae8dec90326ce209476499afdb149e072d753..ffcf5ae9263b18f32a0e979e0064b51275d63ccf 100644 (file)
--- a/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java
+++ b/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java
@@ -75,6 +75,7 @@ public class CSVImportModel {
     private int detailedGeometryIndex = -1;
     private int peakPowerIndex = -1;
     private int regionIndex = -1;
+    private int pipeTypeIndex = -1;
     
     // Third page
 
@@ -515,16 +516,24 @@ public class CSVImportModel {
     public void setPeakPowerIndex(int parseInt) {
         this.peakPowerIndex = parseInt;
     }
-    
+
     public int getPeakPowerIndex() {
         return peakPowerIndex;
     }
-    
+
     public int getRegionIndex() {
         return regionIndex;
     }
-    
+
     public void setRegionIndex(int regionIndex) {
         this.regionIndex = regionIndex;
     }
+
+    public int getPipeTypeIndex() {
+        return pipeTypeIndex;
+    }
+
+    public void setPipeTypeIndex(int pipeTypeIndex) {
+        this.pipeTypeIndex = pipeTypeIndex;
+    }
 }

diff --git a/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java b/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java
index c3ce3dad2084d175f63e261aa48483b61741b5ab..836ebd02dd758e609ec4e12341acc348722ee720 100644 (file)
--- a/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java
+++ b/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java
@@ -379,6 +379,7 @@ public class DistrictImportUtils {
         int lengthIndex = model.getLengthIndex();
         int detailedGeometryIndex = model.getDetailedGeometryIndex();
         int regionIndex = model.getRegionIndex();
+        int pipeTypeIndex = model.getPipeTypeIndex();
         
         int mappingColumn = model.getComponentMappingIndex();
         int idColumn = model.getIdIndex();
@@ -456,10 +457,6 @@ public class DistrictImportUtils {
                                 // Switch to (longitude, latitude)
                                 flipAxes(startCoords);
                                 flipAxes(endCoords);
-                                    
-                                if ("6993003.00000".equals(idValue)) {
-                                    System.err.println("ghere we are!!");
-                                }
                                 
                                 Optional<Resource> oedge = DNEdgeBuilder.create(graph, existingVertices, model.getParentDiagram(), model.getComponentMappings().get(mappingValue), startCoords, startZCoord, endCoords, endZCoord, new double[0], padding, true);
                                 if (oedge.isPresent()) {
@@ -476,6 +473,7 @@ public class DistrictImportUtils {
                                     writeValue(graph, row, edgeFlowAreaIndex, edge, DN.Edge_HasFlowArea);
                                     writeValue(graph, row, lengthIndex, edge, DN.Edge_HasLength);
                                     writeStringValue(graph, row, regionIndex, edge, DN.HasRegion);
+                                    writeStringValue(graph, row, pipeTypeIndex, edge, DN.Edge_HasType);
                                     writeDoubleArrayFromString(graph, row, detailedGeometryIndex, edge, DN.Edge_HasGeometry, actualTransform);
                                 }
                             }

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 4c1e3382778b124e8270f02d1518373d560b114f..06c6b0485a34201c5d1ff4dbb43d018960eb61f4 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -149,6 +149,8 @@ DN.Edge <T DN.Element
         @defProperty "K Supply" L0.Double
     >-- DN.Edge.HasTGround
         @defProperty "T Ground" L0.Double
+    >-- DN.Edge.HasType
+        @defProperty "Pipe Type" L0.String
     @L0.assert DN.Edge.HasDiameter 100.0
     @L0.assert DN.Edge.HasOuterDiameter 125.0
 
@@ -457,6 +459,7 @@ DN.Mapping.EdgeMapping <T DN.Mapping.Base
     >-- DN.Mapping.EdgeMapping.KSupplyAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.TGroundAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.ElevationAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.EdgeMapping.PipeTypeAttribute --> L0.String <R L0.HasProperty
 
 // Allowed connection types
 DN.SupplyConnectionType <T STR.ConnectionType