Merge pull request #2 from opengisch/merge-by-matrix

Dissolve in calculation - Merge right after difference
opengisch · Aug 11, 2023 · b38976c · b38976c
2 parents 1cecd3c + ae16854
commit b38976c
Show file tree

Hide file tree

Showing 5 changed files with 226 additions and 137 deletions.
diff --git a/pzp_utils/processing/danger_zones.py b/pzp_utils/processing/danger_zones.py
@@ -12,6 +12,8 @@
 )
 from qgis.PyQt.QtCore import QVariant
 
+from pzp_utils.processing.merge_by_area import MergeByArea
+
 
 class DangerZones(QgsProcessingAlgorithm):
     INPUT = "INPUT"
@@ -180,18 +182,6 @@ def prepare_process_source(
                 feedback=feedback,
                 is_child_algorithm=True,
             )
-            result = processing.run(
-                "native:dissolve",
-                {
-                    "INPUT": result["OUTPUT"],
-                    "FIELD": f"{matrix_field}",
-                    "SEPARATE_DISJOINT": True,
-                    "OUTPUT": "memory:",
-                },
-                context=context,
-                feedback=feedback,
-                is_child_algorithm=True,
-            )
 
             if final_layer:
                 result = processing.run(
@@ -217,6 +207,60 @@ def prepare_process_source(
                     is_child_algorithm=True,
                 )
 
+                result = processing.run(
+                    "native:multiparttosingleparts",
+                    {
+                        "INPUT": result["OUTPUT"],
+                        "OUTPUT": "memory:",
+                    },
+                    context=context,
+                    feedback=feedback,
+                    is_child_algorithm=True,
+                )
+
+                result = processing.run(
+                    "native:fixgeometries",
+                    {"INPUT": result["OUTPUT"], "OUTPUT": "memory:"},
+                    context=context,
+                    feedback=feedback,
+                    is_child_algorithm=True,
+                )
+
+                result = processing.run(
+                    "pzp:merge_by_area",
+                    {
+                        "INPUT": result["OUTPUT"],
+                        "MODE": MergeByArea.MODE_BOUNDARY,
+                        "OUTPUT": "memory:",
+                    },
+                    context=context,
+                    feedback=feedback,
+                    is_child_algorithm=True,
+                )
+
+                result = processing.run(
+                    "native:multiparttosingleparts",
+                    {
+                        "INPUT": result["OUTPUT"],
+                        "OUTPUT": "memory:",
+                    },
+                    context=context,
+                    feedback=feedback,
+                    is_child_algorithm=True,
+                )
+
+                # Workaround to re-remove small invalid parts that comes back after multi to single
+                result = processing.run(
+                    "pzp:remove_by_area",
+                    {
+                        "INPUT": result["OUTPUT"],
+                        "OUTPUT": "memory:",
+                    },
+                    context=context,
+                    feedback=feedback,
+                    is_child_algorithm=True,
+                )
+
             final_layer = result["OUTPUT"]
 
         result = processing.run(

diff --git a/pzp_utils/processing/fix_geometries.py b/pzp_utils/processing/fix_geometries.py
@@ -1,23 +1,13 @@
+from qgis import processing
 from qgis.core import (
-    QgsFeature,
-    QgsFeatureSink,
-    QgsField,
-    QgsFields,
     QgsProcessing,
     QgsProcessingAlgorithm,
-    QgsProcessingException,
     QgsProcessingParameterFeatureSink,
     QgsProcessingParameterFeatureSource,
-    QgsProcessingParameterField,
-    QgsProcessingParameterMatrix,
 )
-from qgis.PyQt.QtCore import QVariant
-
-from qgis import processing
 
 
 class FixGeometries(QgsProcessingAlgorithm):
-
     INPUT = "INPUT"
     OUTPUT = "OUTPUT"
 
@@ -48,20 +38,13 @@ def initAlgorithm(self, config=None):
             )
         )
 
-        self.addParameter(QgsProcessingParameterFeatureSink(
-            self.OUTPUT, "Output layer"))
+        self.addParameter(QgsProcessingParameterFeatureSink(self.OUTPUT, "Output layer"))
 
     def processAlgorithm(self, parameters, context, feedback):
 
-        min_area_to_keep = 1
-        delete_holes_area = 100
-
         result = processing.run(
             "native:fixgeometries",
-            {
-                'INPUT': parameters[self.INPUT],
-                'OUTPUT': "memory:"
-            },
+            {"INPUT": parameters[self.INPUT], "OUTPUT": "memory:"},
             context=context,
             feedback=feedback,
             is_child_algorithm=True,
@@ -70,9 +53,9 @@ def processAlgorithm(self, parameters, context, feedback):
         result = processing.run(
             "pzp:merge_by_area",
             {
-                'INPUT': result['OUTPUT'],
-                'MODE': 2,
-                'OUTPUT': parameters[self.OUTPUT],
+                "INPUT": result["OUTPUT"],
+                "MODE": 2,
+                "OUTPUT": parameters[self.OUTPUT],
             },
             context=context,
             feedback=feedback,
@@ -82,12 +65,12 @@ def processAlgorithm(self, parameters, context, feedback):
         result = processing.run(
             "native:snappointstogrid",
             {
-                'INPUT': result['OUTPUT'],
-                'HSPACING': 0.001,
-                'VSPACING': 0.001,
-                'ZSPACING': 0,
-                'MSPACING': 0,
-                'OUTPUT': 'memory:',
+                "INPUT": result["OUTPUT"],
+                "HSPACING": 0.001,
+                "VSPACING": 0.001,
+                "ZSPACING": 0,
+                "MSPACING": 0,
+                "OUTPUT": "memory:",
             },
             context=context,
             feedback=feedback,
@@ -97,14 +80,14 @@ def processAlgorithm(self, parameters, context, feedback):
         result = processing.run(
             "native:buffer",
             {
-                'INPUT': result['OUTPUT'],
-                'DISTANCE': -1e-06,
-                'SEGMENTS': 5,
-                'END_CAP_STYLE': 0,
-                'JOIN_STYLE': 0,
-                'MITER_LIMIT': 2,
-                'DISSOLVE': False,
-                'OUTPUT': 'memory:'
+                "INPUT": result["OUTPUT"],
+                "DISTANCE": -1e-06,
+                "SEGMENTS": 5,
+                "END_CAP_STYLE": 0,
+                "JOIN_STYLE": 0,
+                "MITER_LIMIT": 2,
+                "DISSOLVE": False,
+                "OUTPUT": "memory:",
             },
             context=context,
             feedback=feedback,
@@ -114,12 +97,12 @@ def processAlgorithm(self, parameters, context, feedback):
         result = processing.run(
             "native:snappointstogrid",
             {
-                'INPUT': result['OUTPUT'],
-                'HSPACING': 0.001,
-                'VSPACING': 0.001,
-                'ZSPACING': 0,
-                'MSPACING': 0,
-                'OUTPUT': 'memory:',
+                "INPUT": result["OUTPUT"],
+                "HSPACING": 0.001,
+                "VSPACING": 0.001,
+                "ZSPACING": 0,
+                "MSPACING": 0,
+                "OUTPUT": "memory:",
             },
             context=context,
             feedback=feedback,
@@ -129,14 +112,14 @@ def processAlgorithm(self, parameters, context, feedback):
         result = processing.run(
             "native:buffer",
             {
-                'INPUT': result['OUTPUT'],
-                'DISTANCE': 1e-06,
-                'SEGMENTS': 5,
-                'END_CAP_STYLE': 0,
-                'JOIN_STYLE': 0,
-                'MITER_LIMIT': 2,
-                'DISSOLVE': False,
-                'OUTPUT': 'memory:'
+                "INPUT": result["OUTPUT"],
+                "DISTANCE": 1e-06,
+                "SEGMENTS": 5,
+                "END_CAP_STYLE": 0,
+                "JOIN_STYLE": 0,
+                "MITER_LIMIT": 2,
+                "DISSOLVE": False,
+                "OUTPUT": "memory:",
             },
             context=context,
             feedback=feedback,
@@ -146,12 +129,12 @@ def processAlgorithm(self, parameters, context, feedback):
         result = processing.run(
             "native:snappointstogrid",
             {
-                'INPUT': result['OUTPUT'],
-                'HSPACING': 0.001,
-                'VSPACING': 0.001,
-                'ZSPACING': 0,
-                'MSPACING': 0,
-                'OUTPUT': 'memory:',
+                "INPUT": result["OUTPUT"],
+                "HSPACING": 0.001,
+                "VSPACING": 0.001,
+                "ZSPACING": 0,
+                "MSPACING": 0,
+                "OUTPUT": "memory:",
             },
             context=context,
             feedback=feedback,
@@ -160,13 +143,10 @@ def processAlgorithm(self, parameters, context, feedback):
 
         result = processing.run(
             "native:fixgeometries",
-            {
-                'INPUT': result['OUTPUT'],
-                'OUTPUT': "memory:"
-            },
+            {"INPUT": result["OUTPUT"], "OUTPUT": "memory:"},
             context=context,
             feedback=feedback,
             is_child_algorithm=True,
         )
 
-        return {self.OUTPUT: result['OUTPUT']}
+        return {self.OUTPUT: result["OUTPUT"]}