Remove Z/M-values

kreis-viersen · Jun 14, 2024 · 7334b0c · 7334b0c
1 parent 0186c5e
commit 7334b0c
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 7 deletions.
diff --git a/metadata.txt b/metadata.txt
@@ -2,7 +2,7 @@
 name=XPlan-Umring
 qgisMinimumVersion=3.24
 description=Create XPlanGML from polygon(s)
-version=2.11.0
+version=2.12.0
 author=Kreis Viersen
 [email protected]
 
@@ -19,7 +19,9 @@ icon=xplan_umring_icon.png
 experimental=False
 server=False
 hasProcessingProvider=yes
-changelog=v2.11.0:
+changelog=v2.12.0:
+    - Entferne Z/M-Werte von Eingabe-Polygon
+    v2.11.0:
     - neue optionale Attribute "technHerstellDatum" und "erstellungsMassstab" für BP, FP, LP v6.0 
     - Raster-Hilfswerkzeuge: Komprimiere erzeugte Rasterpläne mit Deflate
     - alle Werkzeuge: behebe diverse Fehler für bestimmte Eingabe-Polygone

diff --git a/xplan_umring_algorithm_bp_5_4.py b/xplan_umring_algorithm_bp_5_4.py
@@ -362,8 +362,23 @@ def showWarning(message):
             is_child_algorithm=True,
         )
 
+        # Z/M-Werte fallenlassen
+        alg_params = {
+            "INPUT": outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"],
+            "DROP_M_VALUES": True,
+            "DROP_Z_VALUES": True,
+            "OUTPUT": QgsProcessing.TEMPORARY_OUTPUT,
+        }
+        outputs["ZmwerteFallenlassen"] = processing.run(
+            "native:dropmzvalues",
+            alg_params,
+            context=context,
+            feedback=feedback,
+            is_child_algorithm=True,
+        )
+
         vlayer = QgsProcessingUtils.mapLayerFromString(
-            outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"], context
+            outputs["ZmwerteFallenlassen"]["OUTPUT"], context
         )
 
         request = QgsFeatureRequest()

diff --git a/xplan_umring_algorithm_bp_6_0.py b/xplan_umring_algorithm_bp_6_0.py
@@ -389,8 +389,23 @@ def showWarning(message):
             is_child_algorithm=True,
         )
 
+        # Z/M-Werte fallenlassen
+        alg_params = {
+            "INPUT": outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"],
+            "DROP_M_VALUES": True,
+            "DROP_Z_VALUES": True,
+            "OUTPUT": QgsProcessing.TEMPORARY_OUTPUT,
+        }
+        outputs["ZmwerteFallenlassen"] = processing.run(
+            "native:dropmzvalues",
+            alg_params,
+            context=context,
+            feedback=feedback,
+            is_child_algorithm=True,
+        )
+
         vlayer = QgsProcessingUtils.mapLayerFromString(
-            outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"], context
+            outputs["ZmwerteFallenlassen"]["OUTPUT"], context
         )
 
         request = QgsFeatureRequest()

diff --git a/xplan_umring_algorithm_fp_6_0.py b/xplan_umring_algorithm_fp_6_0.py
@@ -383,8 +383,23 @@ def showWarning(message):
             is_child_algorithm=True,
         )
 
+        # Z/M-Werte fallenlassen
+        alg_params = {
+            "INPUT": outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"],
+            "DROP_M_VALUES": True,
+            "DROP_Z_VALUES": True,
+            "OUTPUT": QgsProcessing.TEMPORARY_OUTPUT,
+        }
+        outputs["ZmwerteFallenlassen"] = processing.run(
+            "native:dropmzvalues",
+            alg_params,
+            context=context,
+            feedback=feedback,
+            is_child_algorithm=True,
+        )
+
         vlayer = QgsProcessingUtils.mapLayerFromString(
-            outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"], context
+            outputs["ZmwerteFallenlassen"]["OUTPUT"], context
         )
 
         request = QgsFeatureRequest()

diff --git a/xplan_umring_algorithm_lp_6_0.py b/xplan_umring_algorithm_lp_6_0.py
@@ -426,8 +426,23 @@ def showWarning(message):
             is_child_algorithm=True,
         )
 
+        # Z/M-Werte fallenlassen
+        alg_params = {
+            "INPUT": outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"],
+            "DROP_M_VALUES": True,
+            "DROP_Z_VALUES": True,
+            "OUTPUT": QgsProcessing.TEMPORARY_OUTPUT,
+        }
+        outputs["ZmwerteFallenlassen"] = processing.run(
+            "native:dropmzvalues",
+            alg_params,
+            context=context,
+            feedback=feedback,
+            is_child_algorithm=True,
+        )
+
         vlayer = QgsProcessingUtils.mapLayerFromString(
-            outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"], context
+            outputs["ZmwerteFallenlassen"]["OUTPUT"], context
         )
 
         request = QgsFeatureRequest()

diff --git a/xplan_umring_algorithm_replace_geometry.py b/xplan_umring_algorithm_replace_geometry.py
@@ -290,8 +290,23 @@ def processAlgorithm(self, parameters, context, feedback):
             is_child_algorithm=True,
         )
 
+        # Z/M-Werte fallenlassen
+        alg_params = {
+            "INPUT": outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"],
+            "DROP_M_VALUES": True,
+            "DROP_Z_VALUES": True,
+            "OUTPUT": QgsProcessing.TEMPORARY_OUTPUT,
+        }
+        outputs["ZmwerteFallenlassen"] = processing.run(
+            "native:dropmzvalues",
+            alg_params,
+            context=context,
+            feedback=feedback,
+            is_child_algorithm=True,
+        )
+
         vlayer = QgsProcessingUtils.mapLayerFromString(
-            outputs["DoppelteSttzpunkteEntfernen"]["OUTPUT"], context
+            outputs["ZmwerteFallenlassen"]["OUTPUT"], context
         )
 
         request = QgsFeatureRequest()