[processing] restore buffer algorithm

qgis · Oct 11, 2017 · 98dfda3 · 98dfda3
1 parent bba509e
commit 98dfda3
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 195 deletions.
diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py b/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
@@ -73,6 +73,7 @@
 # from .gdalcalc import gdalcalc
 # from .rasterize_over import rasterize_over
 
+from .Buffer import Buffer
 from .OffsetCurve import OffsetCurve
 from .ogrinfo import ogrinfo
 from .OgrToPostGis import OgrToPostGis
@@ -82,7 +83,6 @@
 # from .ogr2ogrclip import Ogr2OgrClip
 # from .ogr2ogrclipextent import Ogr2OgrClipExtent
 # from .ogr2ogrtopostgislist import Ogr2OgrToPostGisList
-# from .ogr2ogrbuffer import Ogr2OgrBuffer
 # from .ogr2ogrdissolve import Ogr2OgrDissolve
 # from .onesidebuffer import OneSideBuffer
 # from .ogr2ogrtabletopostgislist import Ogr2OgrTableToPostGisList
@@ -175,6 +175,7 @@ def loadAlgorithms(self):
             # gdalcalc(),
             # rasterize_over(),
             # ----- OGR tools -----
+            Buffer(),
             OffsetCurve(),
             ogrinfo(),
             OgrToPostGis(),
@@ -183,7 +184,6 @@ def loadAlgorithms(self):
             # Ogr2OgrClip(),
             # Ogr2OgrClipExtent(),
             # Ogr2OgrToPostGisList(),
-            # Ogr2OgrBuffer(),
             # Ogr2OgrDissolve(),
             # OneSideBuffer(),
             # Ogr2OgrTableToPostGisList(),

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrbuffer.py b/python/plugins/processing/algs/gdal/ogr2ogrbuffer.py
diff --git a/python/plugins/processing/tests/testdata/gdal_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/gdal_algorithm_tests.yaml
@@ -489,6 +489,62 @@ tests:
           geometry:
             precision: 7
 
+  - algorithm: gdal:buffervectors
+    name: Buffer lines
+    params:
+      DISSOLVEALL: false
+      DISTANCE: 1.0
+      GEOMETRY: geometry
+      INPUT_LAYER:
+        name: lines.gml
+        type: vector
+      MULTI: false
+    results:
+      OUTPUT_LAYER:
+        name: expected/gdal/buffer_lines.gml
+        type: vector
+        compare:
+          geometry:
+            precision: 7
+    expectedFailure:
+      - int(1)
+
+  - algorithm: gdal:buffervectors
+    name: Basic polygon buffer
+    params:
+      DISSOLVEALL: false
+      DISTANCE: 0.5
+      GEOMETRY: geometry
+      INPUT_LAYER:
+        name: polys.gml
+        type: vector
+      MULTI: false
+    results:
+      OUTPUT_LAYER:
+        name: expected/gdal/buffer_polys.gml
+        type: vector
+        compare:
+          geometry:
+            precision: 7
+
+  - algorithm: gdal:buffervectors
+    name: Polygon buffer with dissolve
+    params:
+      DISSOLVEALL: true
+      DISTANCE: 0.5
+      GEOMETRY: geometry
+      INPUT_LAYER:
+        name: polys.gml
+        type: vector
+      MULTI: false
+    results:
+      OUTPUT_LAYER:
+        name: expected/gdal/buffer_polys_dissolve.gml
+        type: vector
+        compare:
+          geometry:
+            precision: 7
+
 #  - algorithm: gdal:singlesidedbufferforlines
 #    name: One-side buffer for lines (left-handed)
 #    params:
@@ -508,59 +564,3 @@ tests:
 #          geometry:
 #            precision: 7
 #
-#  - algorithm: gdal:buffervectors
-#    name: Buffer lines
-#    params:
-#      DISSOLVEALL: false
-#      DISTANCE: 1.0
-#      GEOMETRY: geometry
-#      INPUT_LAYER:
-#        name: lines.gml
-#        type: vector
-#      MULTI: false
-#    results:
-#      OUTPUT_LAYER:
-#        name: expected/gdal/buffer_lines.gml
-#        type: vector
-#        compare:
-#          geometry:
-#            precision: 7
-#    expectedFailure:
-#      - int(1)
-#
-#  - algorithm: gdal:buffervectors
-#    name: Basic polygon buffer
-#    params:
-#      DISSOLVEALL: false
-#      DISTANCE: 0.5
-#      GEOMETRY: geometry
-#      INPUT_LAYER:
-#        name: polys.gml
-#        type: vector
-#      MULTI: false
-#    results:
-#      OUTPUT_LAYER:
-#        name: expected/gdal/buffer_polys.gml
-#        type: vector
-#        compare:
-#          geometry:
-#            precision: 7
-#
-#  - algorithm: gdal:buffervectors
-#    name: Polygon buffer with dissolve
-#    params:
-#      DISSOLVEALL: true
-#      DISTANCE: 0.5
-#      GEOMETRY: geometry
-#      INPUT_LAYER:
-#        name: polys.gml
-#        type: vector
-#      MULTI: false
-#    results:
-#      OUTPUT_LAYER:
-#        name: expected/gdal/buffer_polys_dissolve.gml
-#        type: vector
-#        compare:
-#          geometry:
-#            precision: 7
-#