mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
[processing][saga] Remove duplicate polygon union algorithm
Also - fix typo in algorithm name - add unit test
This commit is contained in:
parent
939551bc35
commit
07530be1b6
@ -155,7 +155,7 @@ algorithms = {'Add Grid Values to Points': 'Add raster values to points',
|
||||
'Threshold Buffer': 'Threshold raster buffer',
|
||||
'Transform Shapes': 'Transform vector layer',
|
||||
'Transpose Grids': 'Transpose Raster layers',
|
||||
'Union': 'Polygon uUnion',
|
||||
'Union': 'Polygon union',
|
||||
'Update': 'Polygon update',
|
||||
'Upslope Area': 'Upslope Area',
|
||||
'Zonal Grid Statistics': 'Zonal raster statistics'}
|
||||
|
@ -1,6 +0,0 @@
|
||||
Union
|
||||
shapes_polygons
|
||||
QgsProcessingParameterFeatureSource|A|Layer A|2|None|False
|
||||
QgsProcessingParameterFeatureSource|B|Layer B|2|None|False
|
||||
QgsProcessingParameterBoolean|SPLIT|Split Parts|True
|
||||
QgsProcessingParameterVectorDestination|RESULT|Union
|
@ -1,6 +1,7 @@
|
||||
Union
|
||||
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|Union
|
||||
QgsProcessingParameterBoolean|SPLIT|Split Parts|True
|
||||
|
||||
|
BIN
python/plugins/processing/tests/testdata/expected/saga/polygon_union.dbf
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/expected/saga/polygon_union.dbf
vendored
Normal file
Binary file not shown.
30
python/plugins/processing/tests/testdata/expected/saga/polygon_union.mshp
vendored
Normal file
30
python/plugins/processing/tests/testdata/expected/saga/polygon_union.mshp
vendored
Normal file
@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<SAGA_METADATA>
|
||||
<HISTORY saga-version="2.3.1">
|
||||
<MODULE library="shapes_polygons" id="17" name="Union">
|
||||
<OPTION type="boolean" id="SPLIT" name="Split Parts">TRUE</OPTION>
|
||||
<INPUT type="shapes" id="A" name="Layer A">
|
||||
<FILE>/tmp/processing_f4f8099de2914a338919dfb3c81e2077/851001ad50d34bfdb0cace8002847515/A.shp</FILE>
|
||||
</INPUT>
|
||||
<INPUT type="shapes" id="B" name="Layer B">
|
||||
<FILE>/tmp/processing_f4f8099de2914a338919dfb3c81e2077/9bedbac0e98f4ace867e311eeba399ef/B.shp</FILE>
|
||||
</INPUT>
|
||||
<OUTPUT type="shapes" id="RESULT" name="Union">Union [A]-[B]</OUTPUT>
|
||||
</MODULE>
|
||||
</HISTORY>
|
||||
<SOURCE>
|
||||
<FILE></FILE>
|
||||
<DATABASE>
|
||||
<FIELDS>
|
||||
<FIELD TYPE="STRING">id_a</FIELD>
|
||||
<FIELD TYPE="STRING">id_b</FIELD>
|
||||
</FIELDS>
|
||||
</DATABASE>
|
||||
<PROJECTION>
|
||||
<OGC_WKT>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]]</OGC_WKT>
|
||||
<PROJ4></PROJ4>
|
||||
<EPSG>-1</EPSG>
|
||||
</PROJECTION>
|
||||
</SOURCE>
|
||||
<DESCRIPTION></DESCRIPTION>
|
||||
</SAGA_METADATA>
|
1
python/plugins/processing/tests/testdata/expected/saga/polygon_union.prj
vendored
Normal file
1
python/plugins/processing/tests/testdata/expected/saga/polygon_union.prj
vendored
Normal file
@ -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"]]
|
BIN
python/plugins/processing/tests/testdata/expected/saga/polygon_union.shp
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/expected/saga/polygon_union.shp
vendored
Normal file
Binary file not shown.
BIN
python/plugins/processing/tests/testdata/expected/saga/polygon_union.shx
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/expected/saga/polygon_union.shx
vendored
Normal file
Binary file not shown.
@ -270,3 +270,18 @@ tests:
|
||||
name: expected/saga/polygon_update.shp
|
||||
type: vector
|
||||
|
||||
- algorithm: saga:polygonunion
|
||||
name: Polygon union
|
||||
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_union.shp
|
||||
type: vector
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user