[needs-docs][processing] merge grid algorithms and add point grid type

qgis · Jan 23, 2018 · aaf9793 · aaf9793
1 parent c91fd5a
commit aaf9793
Show file tree

Hide file tree

Showing 10 changed files with 178 additions and 480 deletions.
diff --git a/...ugins/processing/algs/qgis/GridPolygon.py → python/plugins/processing/algs/qgis/Grid.py b/...ugins/processing/algs/qgis/GridPolygon.py → python/plugins/processing/algs/qgis/Grid.py
diff --git a/python/plugins/processing/algs/qgis/GridLine.py b/python/plugins/processing/algs/qgis/GridLine.py
diff --git a/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py
@@ -70,8 +70,7 @@
 from .FindProjection import FindProjection
 from .GeometryConvert import GeometryConvert
 from .GeometryByExpression import GeometryByExpression
-from .GridLine import GridLine
-from .GridPolygon import GridPolygon
+from .Grid import Grid
 from .Heatmap import Heatmap
 from .Hillshade import Hillshade
 from .HubDistanceLines import HubDistanceLines
@@ -191,8 +190,7 @@ def getAlgs(self):
                 FindProjection(),
                 GeometryByExpression(),
                 GeometryConvert(),
-                GridLine(),
-                GridPolygon(),
+                Grid(),
                 Heatmap(),
                 Hillshade(),
                 HubDistanceLines(),

diff --git a/python/plugins/processing/tests/testdata/expected/create_grid_lines.gfs b/python/plugins/processing/tests/testdata/expected/create_grid_lines.gfs
@@ -37,10 +37,5 @@
       <ElementPath>id</ElementPath>
       <Type>Integer</Type>
     </PropertyDefn>
-    <PropertyDefn>
-      <Name>coord</Name>
-      <ElementPath>coord</ElementPath>
-      <Type>Real</Type>
-    </PropertyDefn>
   </GMLFeatureClass>
 </GMLFeatureClassList>