X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.feature%2FrootFiles%2FQGIS%20scripts%2FgenerateCSV.py;fp=org.simantics.district.feature%2FrootFiles%2FQGIS%20scripts%2FgenerateCSV.py;h=e4d51508d98e75f7beaa47ee581c8dbe0555ea22;hb=8233a2acfc2f23ab9262cf12859bca0066d8a74b;hp=5a9197a4edc64d5040963d85c2829145a2a34b1f;hpb=84f0518e8fb729f87ac51a1407c70a778e9bd495;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.feature/rootFiles/QGIS scripts/generateCSV.py b/org.simantics.district.feature/rootFiles/QGIS scripts/generateCSV.py
index 5a9197a4..e4d51508 100644
--- a/org.simantics.district.feature/rootFiles/QGIS scripts/generateCSV.py	
+++ b/org.simantics.district.feature/rootFiles/QGIS scripts/generateCSV.py	
@@ -27,7 +27,7 @@ from qgis.core import (QgsProcessing,
                        QgsUnitTypes)
 import processing
 import re
-
+from operator import itemgetter
 
 class SpanCoordinatesAlgorithm(QgsProcessingAlgorithm):
     """
@@ -207,6 +207,7 @@ class SpanCoordinatesAlgorithm(QgsProcessingAlgorithm):
         if not ('Length' in sourceNames): outputFields.append(QgsField('Length', QVariant.Double))
         if not ('LineString' in sourceNames): outputFields.append(QgsField('LineString', QVariant.String))
         if not ('DimensionDN' in sourceNames): outputFields.append(QgsField('DimensionDN', QVariant.Int))
+        if not ('PipeStruct' in sourceNames): outputFields.append(QgsField('PipeStruct', QVariant.String))
         
         (output, outputId) = self.parameterAsSink(
             parameters,
@@ -234,6 +235,9 @@ class SpanCoordinatesAlgorithm(QgsProcessingAlgorithm):
         # Dictionary from span feature ids to lists of lists of QgsPoint objects
         strings = dict()
         
+        # Dictionary for the PipeStruct field values
+        types = dict()
+        
         spanFeatures = span.getFeatures()
         pipeFeatures = pipe.getFeatures()
         
@@ -246,7 +250,9 @@ class SpanCoordinatesAlgorithm(QgsProcessingAlgorithm):
             fatherID = feature[self.FATHER_ID]
             
             # Length
-            myLength = geometry.length()
+            myLength = feature['Length']
+            if myLength == None:
+                myLength = geometry.length()
             
             oldLength = lengths.get(fatherID, 0.0)
             lengths[fatherID] = oldLength + myLength
@@ -265,6 +271,14 @@ class SpanCoordinatesAlgorithm(QgsProcessingAlgorithm):
             pointList.append(mylist)
             strings[fatherID] = pointList
             
+            # Store the value of PipeStruct
+            t = feature['PipeStruct']
+            tt = types.get(fatherID, {})
+            types[fatherID] = tt
+            c = tt.get(t, 0)
+            c += myLength
+            tt[t] = c
+            
             # Update the progress bar
             feedback.setProgress(int(counter * total))
 
@@ -353,6 +367,16 @@ class SpanCoordinatesAlgorithm(QgsProcessingAlgorithm):
             outputFeature['Length'] = feature['Length'] # myLength
             outputFeature['LineString'] = result
             
+            # Handle pipe type codes
+            mytypes = list(types.get(id, {}).items())
+            if len(mytypes) == 0:
+                feedback.pushInfo('No type codes for feature {}'.format(id))
+            else:
+                if len(mytypes) > 1:
+                    mytypes.sort(key = itemgetter(1))
+                    feedback.pushInfo('No unique type code for feature {}: {}'.format(id, mytypes))
+                outputFeature['PipeStruct'] = mytypes[-1][0]
+            
             label = feature['Label']
             m = self.DN_PATTERN.fullmatch(label)
             if m: