[processing] Add algorithm to strip null geometries

2025-04-14 00:07:35 -04:00 · 2016-10-24 11:07:00 +10:00 · 2016-10-24 11:07:00 +10:00 · 5eb875d63b
commit 5eb875d63b
parent 12a7bb34e8
6 changed files with 164 additions and 2 deletions
--- a/python/plugins/processing/algs/help/qgis.yaml
+++ b/python/plugins/processing/algs/help/qgis.yaml
@ -397,6 +397,8 @@ qgis:refactorfields: >

 qgis:regularpoints:

+qgis:removenullgeometries: >
+  This algorithms removes any features which do not have a geometry from a vector layer. All other features will be copied unchanged.

 qgis:reprojectlayer: >
  This algorithm reprojects a vector layer. It creates a new layer with the same features as the input one, but with geometries reprojected to a new CRS.
--- a/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
+++ b/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
@ -169,7 +169,7 @@ from .IdwInterpolationAttribute import IdwInterpolationAttribute
 from .TinInterpolationZValue import TinInterpolationZValue
 from .TinInterpolationAttribute import TinInterpolationAttribute
 from .ZonalStatisticsQgis import ZonalStatisticsQgis
-
+from .RemoveNullGeometry import RemoveNullGeometry

 pluginPath = os.path.normpath(os.path.join(
    os.path.split(os.path.dirname(__file__))[0], os.pardir))
@ -230,7 +230,8 @@ class QGISAlgorithmProvider(AlgorithmProvider):
                        Aspect(), Slope(), Ruggedness(), Hillshade(),
                        ReliefAuto(), ZonalStatisticsQgis(),
                        IdwInterpolationZValue(), IdwInterpolationAttribute(),
-                        TinInterpolationZValue(), TinInterpolationAttribute()
+                        TinInterpolationZValue(), TinInterpolationAttribute(),
+                        RemoveNullGeometry()
                        ]

        if hasMatplotlib:
--- a/python/plugins/processing/algs/qgis/RemoveNullGeometry.py
+++ b/python/plugins/processing/algs/qgis/RemoveNullGeometry.py
@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    RemoveNullGeometry.py
+    --------------
+    Date                 : October 2016
+    Copyright            : (C) 2016 by Nyall Dawson
+    Email                : nyall dot dawson at gmail dot com
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+
+__author__ = 'Nyall Dawson'
+__date__ = 'October 2016'
+__copyright__ = '(C) 2016, Nyall Dawson'
+
+# This will get replaced with a git SHA1 when you do a git archive323
+
+__revision__ = '$Format:%H$'
+
+from processing.core.GeoAlgorithm import GeoAlgorithm
+from processing.core.parameters import ParameterVector
+from processing.core.outputs import OutputVector
+from processing.tools import dataobjects, vector
+
+
+class RemoveNullGeometry(GeoAlgorithm):
+
+    INPUT_LAYER = 'INPUT_LAYER'
+    OUTPUT_LAYER = 'OUTPUT_LAYER'
+
+    def defineCharacteristics(self):
+        self.name, self.i18n_name = self.trAlgorithm('Remove null geometries')
+        self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
+
+        self.addParameter(ParameterVector(self.INPUT_LAYER,
+                                          self.tr('Input layer'), [dataobjects.TYPE_VECTOR_ANY]))
+        self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Removed null geometry')))
+
+    def processAlgorithm(self, progress):
+        layer = dataobjects.getObjectFromUri(
+            self.getParameterValue(self.INPUT_LAYER))
+        writer = self.getOutputFromName(
+            self.OUTPUT_LAYER).getVectorWriter(
+                layer.fields(),
+                layer.wkbType(),
+                layer.crs())
+
+        features = vector.features(layer)
+        total = 100.0 / len(features)
+
+        for current, input_feature in enumerate(features):
+            if input_feature.hasGeometry():
+                writer.addFeature(input_feature)
+
+            progress.setPercentage(int(current * total))
+
+        del writer
--- a/python/plugins/processing/tests/testdata/expected/remove_null_polys.gfs
+++ b/python/plugins/processing/tests/testdata/expected/remove_null_polys.gfs
@ -0,0 +1,31 @@
+<GMLFeatureClassList>
+  <GMLFeatureClass>
+    <Name>remove_null_polys</Name>
+    <ElementPath>remove_null_polys</ElementPath>
+    <GeometryType>3</GeometryType>
+    <SRSName>EPSG:4326</SRSName>
+    <DatasetSpecificInfo>
+      <FeatureCount>5</FeatureCount>
+      <ExtentXMin>-1.00000</ExtentXMin>
+      <ExtentXMax>10.00000</ExtentXMax>
+      <ExtentYMin>-3.00000</ExtentYMin>
+      <ExtentYMax>6.00000</ExtentYMax>
+    </DatasetSpecificInfo>
+    <PropertyDefn>
+      <Name>name</Name>
+      <ElementPath>name</ElementPath>
+      <Type>String</Type>
+      <Width>5</Width>
+    </PropertyDefn>
+    <PropertyDefn>
+      <Name>intval</Name>
+      <ElementPath>intval</ElementPath>
+      <Type>Integer</Type>
+    </PropertyDefn>
+    <PropertyDefn>
+      <Name>floatval</Name>
+      <ElementPath>floatval</ElementPath>
+      <Type>Real</Type>
+    </PropertyDefn>
+  </GMLFeatureClass>
+</GMLFeatureClassList>
--- a/python/plugins/processing/tests/testdata/expected/remove_null_polys.gml
+++ b/python/plugins/processing/tests/testdata/expected/remove_null_polys.gml
@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation=""
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml">
+  <gml:boundedBy>
+    <gml:Box>
+      <gml:coord><gml:X>-1</gml:X><gml:Y>-3</gml:Y></gml:coord>
+      <gml:coord><gml:X>10</gml:X><gml:Y>6</gml:Y></gml:coord>
+    </gml:Box>
+  </gml:boundedBy>
+                                                                                                                                                             
+  <gml:featureMember>
+    <ogr:remove_null_polys fid="polys.0">
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-1,-1 -1,3 3,3 3,2 2,2 2,-1 -1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:name>aaaaa</ogr:name>
+      <ogr:intval>33</ogr:intval>
+      <ogr:floatval>44.123456</ogr:floatval>
+    </ogr:remove_null_polys>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:remove_null_polys fid="polys.1">
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>5,5 6,4 4,4 5,5</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:name>Aaaaa</ogr:name>
+      <ogr:intval>-33</ogr:intval>
+      <ogr:floatval>0</ogr:floatval>
+    </ogr:remove_null_polys>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:remove_null_polys fid="polys.2">
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>2,5 2,6 3,6 3,5 2,5</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:name>bbaaa</ogr:name>
+      <ogr:floatval>0.123</ogr:floatval>
+    </ogr:remove_null_polys>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:remove_null_polys fid="polys.3">
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>6,1 10,1 10,-3 6,-3 6,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>7,0 7,-2 9,-2 9,0 7,0</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:name>ASDF</ogr:name>
+      <ogr:intval>0</ogr:intval>
+    </ogr:remove_null_polys>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:remove_null_polys fid="polys.5">
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,2 6,1 6,-3 2,-1 2,2 3,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:name>elim</ogr:name>
+      <ogr:intval>2</ogr:intval>
+      <ogr:floatval>3.33</ogr:floatval>
+    </ogr:remove_null_polys>
+  </gml:featureMember>
+</ogr:FeatureCollection>
--- a/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
+++ b/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
@ -1202,3 +1202,14 @@ tests:
      #TRIANULATION_FILE:
      #  name: expected/triangulation.gml
      #  type: vector
+
+  - algorithm: qgis:removenullgeometries
+    name: Remove null geometries
+    params:
+      INPUT_LAYER:
+        name: polys.gml
+        type: vector
+    results:
+      OUTPUT_LAYER:
+        name: expected/remove_null_polys.gml
+        type: vector