Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[processing][saga] Remove duplicate polygon update algorithm, add test
  • Loading branch information
nyalldawson committed Jun 15, 2018
1 parent f07b90d commit 939551b
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 10 deletions.

This file was deleted.

9 changes: 5 additions & 4 deletions python/plugins/processing/algs/saga/description/Update.txt
@@ -1,6 +1,7 @@
Update
shapes_polygons
QgsProcessingParameterFeatureSource|A|Layer A|-1|None|False
QgsProcessingParameterFeatureSource|B|Layer B|-1|None|False
QgsProcessingParameterVectorDestination|RESULT|Update
QgsProcessingParameterBoolean|SPLIT|Split Parts|True
QgsProcessingParameterFeatureSource|A|Layer A|2|None|False
QgsProcessingParameterFeatureSource|B|Layer B|2|None|False
QgsProcessingParameterBoolean|SPLIT|Split Parts|True
QgsProcessingParameterVectorDestination|RESULT|Updated polygons

Binary file not shown.
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<SAGA_METADATA>
<HISTORY saga-version="2.3.1">
<MODULE library="shapes_polygons" id="18" name="Update">
<OPTION type="boolean" id="SPLIT" name="Split Parts">TRUE</OPTION>
<INPUT type="shapes" id="A" name="Layer A">
<FILE>/tmp/processing_b75fcd9168f8489ba19ebd96a565e579/4efad9e3dea24a48bff2f8b7c91a9a0e/A.shp</FILE>
</INPUT>
<INPUT type="shapes" id="B" name="Layer B">
<FILE>/tmp/processing_b75fcd9168f8489ba19ebd96a565e579/36f8b6f802604b8f9c33bca423719320/B.shp</FILE>
</INPUT>
<OUTPUT type="shapes" id="RESULT" name="Update">Update [A]-[B]</OUTPUT>
</MODULE>
</HISTORY>
<SOURCE>
<FILE></FILE>
<DATABASE>
<FIELDS>
<FIELD TYPE="STRING">id_a</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>
@@ -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"]]
Binary file not shown.
Binary file not shown.
15 changes: 15 additions & 0 deletions python/plugins/processing/tests/testdata/saga_algorithm_tests.yaml
Expand Up @@ -255,3 +255,18 @@ tests:
hash: ec7b708609178533ac2b89cd575140415ef93c70396fa630d1c15b67
type: rasterhash

- algorithm: saga:polygonupdate
name: Polygon update
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_update.shp
type: vector

0 comments on commit 939551b

Please sign in to comment.