diff --git a/python/plugins/processing/algs/saga/description/Difference.txt b/python/plugins/processing/algs/saga/description/Difference.txt index b87269833a9f..1d293b5649e4 100644 --- a/python/plugins/processing/algs/saga/description/Difference.txt +++ b/python/plugins/processing/algs/saga/description/Difference.txt @@ -1,6 +1,7 @@ Difference shapes_polygons -QgsProcessingParameterFeatureSource|A|Layer A|-1|None|False -QgsProcessingParameterFeatureSource|B|Layer B|-1|None|False +QgsProcessingParameterFeatureSource|A|Layer A|2|None|False +QgsProcessingParameterFeatureSource|B|Layer B|2|None|False +QgsProcessingParameterBoolean|SPLIT|Split Parts|True QgsProcessingParameterVectorDestination|RESULT|Difference -QgsProcessingParameterBoolean|SPLIT|Split Parts|True \ No newline at end of file + diff --git a/python/plugins/processing/algs/saga/description/PolygonDifference.txt b/python/plugins/processing/algs/saga/description/PolygonDifference.txt deleted file mode 100644 index f045daa45b04..000000000000 --- a/python/plugins/processing/algs/saga/description/PolygonDifference.txt +++ /dev/null @@ -1,6 +0,0 @@ -Difference -shapes_polygons -QgsProcessingParameterFeatureSource|A|Layer A|2|None|False -QgsProcessingParameterFeatureSource|B|Layer B|2|None|False -QgsProcessingParameterBoolean|SPLIT|Split Parts|True -QgsProcessingParameterVectorDestination|RESULT|Difference diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.dbf b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.dbf new file mode 100644 index 000000000000..b0e76e6b0bf7 Binary files /dev/null and b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.dbf differ diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.mshp b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.mshp new file mode 100644 index 000000000000..a65ecd6888d9 --- /dev/null +++ b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.mshp @@ -0,0 +1,29 @@ + + + + + + + /tmp/processing_e049cb7c46df450286b636d45e999b58/a73e875cc8f84acc9cd2f1d9229d6e48/A.shp + + + /tmp/processing_e049cb7c46df450286b636d45e999b58/b10dbbabca9c46aca3e7acaa93a0bf24/B.shp + + Difference [A]-[B] + + + + + + + id_a + + + + PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0]] + + -1 + + + + diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.prj b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.prj new file mode 100644 index 000000000000..e375a0de156d --- /dev/null +++ b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.prj @@ -0,0 +1 @@ +PROJCS["WGS 84 / Pseudo-Mercator",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",0],PARAMETER["scale_factor",1],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],EXTENSION["PROJ4","+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"],AUTHORITY["EPSG","3857"]] \ No newline at end of file diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.shp b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.shp new file mode 100644 index 000000000000..20c69316ea8f Binary files /dev/null and b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.shp differ diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.shx b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.shx new file mode 100644 index 000000000000..b30c69b41c90 Binary files /dev/null and b/python/plugins/processing/tests/testdata/expected/saga/polygon_difference.shx differ diff --git a/python/plugins/processing/tests/testdata/saga_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/saga_algorithm_tests.yaml index 64609792a6b4..2741ce7180a6 100644 --- a/python/plugins/processing/tests/testdata/saga_algorithm_tests.yaml +++ b/python/plugins/processing/tests/testdata/saga_algorithm_tests.yaml @@ -300,3 +300,19 @@ tests: name: expected/saga/polygon_identity.shp type: vector + - algorithm: saga:difference + name: Polygon difference + params: + A: + name: custom/overlay1_a.geojson + type: vector + B: + name: custom/overlay1_b.geojson + type: vector + SPLIT: true + results: + RESULT: + name: expected/saga/polygon_difference.shp + type: vector + +