From c85b1649c8f7b95c3ec3b3ec1e5a8337ab4dfd2f Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 15 Jun 2018 11:16:08 +1000 Subject: [PATCH] [processing][saga] Remove duplicate symmetrical difference alg and add test. Warnings: SAGA results are bad here! Use the native QGIS alg instead --- .../PolygonSymmetricalDifference.txt | 6 ---- .../description/SymmetricalDifference.txt | 7 ++-- .../saga/polygon_symmetrical_difference.dbf | Bin 0 -> 157 bytes .../saga/polygon_symmetrical_difference.mshp | 30 ++++++++++++++++++ .../saga/polygon_symmetrical_difference.prj | 1 + .../saga/polygon_symmetrical_difference.shp | Bin 0 -> 1796 bytes .../saga/polygon_symmetrical_difference.shx | Bin 0 -> 196 bytes .../tests/testdata/saga_algorithm_tests.yaml | 15 +++++++++ 8 files changed, 50 insertions(+), 9 deletions(-) delete mode 100644 python/plugins/processing/algs/saga/description/PolygonSymmetricalDifference.txt create mode 100644 python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.dbf create mode 100644 python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.mshp create mode 100644 python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.prj create mode 100644 python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.shp create mode 100644 python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.shx diff --git a/python/plugins/processing/algs/saga/description/PolygonSymmetricalDifference.txt b/python/plugins/processing/algs/saga/description/PolygonSymmetricalDifference.txt deleted file mode 100644 index 519decdd280..00000000000 --- a/python/plugins/processing/algs/saga/description/PolygonSymmetricalDifference.txt +++ /dev/null @@ -1,6 +0,0 @@ -Symmetrical Difference -shapes_polygons -QgsProcessingParameterFeatureSource|A|Layer A|2|None|False -QgsProcessingParameterFeatureSource|B|Layer B|2|None|False -QgsProcessingParameterBoolean|SPLIT|Split Parts|True -QgsProcessingParameterVectorDestination|RESULT|Symmetrical Difference diff --git a/python/plugins/processing/algs/saga/description/SymmetricalDifference.txt b/python/plugins/processing/algs/saga/description/SymmetricalDifference.txt index 6f0e602e0a9..0693d80531a 100644 --- a/python/plugins/processing/algs/saga/description/SymmetricalDifference.txt +++ b/python/plugins/processing/algs/saga/description/SymmetricalDifference.txt @@ -1,6 +1,7 @@ Symmetrical 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|Symmetrical Difference -QgsProcessingParameterBoolean|SPLIT|Split Parts|True \ No newline at end of file + diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.dbf b/python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.dbf new file mode 100644 index 0000000000000000000000000000000000000000..b5e6a8d08abf65b22abf010940910bb693ffa929 GIT binary patch literal 157 zcmZQBW8>#xU|>jOU@2t*je2n7Wv PkUWF{$vc7MA%rmiOur7G literal 0 HcmV?d00001 diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.mshp b/python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.mshp new file mode 100644 index 00000000000..417b26e506f --- /dev/null +++ b/python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.mshp @@ -0,0 +1,30 @@ + + + + + + + /tmp/processing_5303da0b04074aa18f9aa27b64623852/07e557e1ee824d87bb81b1f30a1568be/A.shp + + + /tmp/processing_5303da0b04074aa18f9aa27b64623852/e098db0548af4075a60aa2f63b7e6ee6/B.shp + + Symmetrical Difference [A]-[B] + + + + + + + id_a + id_b + + + + 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_symmetrical_difference.prj b/python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.prj new file mode 100644 index 00000000000..e375a0de156 --- /dev/null +++ b/python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_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_symmetrical_difference.shp b/python/plugins/processing/tests/testdata/expected/saga/polygon_symmetrical_difference.shp new file mode 100644 index 0000000000000000000000000000000000000000..26ab1b9b3bc9c5cc25c8299ce88ada675488983c GIT binary patch literal 1796 zcmZ{jK~lpo5CjzxNC+Hq$RP(GTrMg+13iH^@mh{Nf%QsVk|t|a#gp;QtjB99rO$H; z*Z${spVIR~?eDAHT5`dA#lkkOJG=kgdeP%ny>rETUWG^dbt{+uXw?fRN9$F5@Q>Oj zRaEZ%pUjgVbDqR|^_)#-F7x>{p(U5{Yt^Aw?s}VipMxIYrS`Z4InXFJPsyoV_0A7t z4m@P$o7{pN)X=IIj&2LxzmB^5E^~eVsp3*`4suXKt6n&WUb*{U(vXA9^ai6G)IjyZ zc`iETet$h8-8@u_X9?y(4OB0DYYzAvPnIJ%*X(_?ljj)EH8r$bn6f>?7P*vjpMJ`{ z@2fTF=Ea_5&olezJgFA0`&T)=(K|nnIo9`D7aC>|ohNE&i?ey*ybF5e?te3NHxFh? mZ?Z=@sG(Iaoadrf?*8{N2U@-%&xp