[processing][saga] Remove duplicate intersect alg, add test

qgis · Jun 15, 2018 · dd9e46f · dd9e46f
1 parent c85b164
commit dd9e46f
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 9 deletions.
diff --git a/python/plugins/processing/algs/saga/description/Intersect.txt b/python/plugins/processing/algs/saga/description/Intersect.txt
@@ -1,6 +1,7 @@
 Intersect
 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|Intersect
-QgsProcessingParameterBoolean|SPLIT|Split Parts|True
+
diff --git a/python/plugins/processing/algs/saga/description/PolygonIntersect.txt b/python/plugins/processing/algs/saga/description/PolygonIntersect.txt
diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.dbf b/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.mshp b/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.mshp
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SAGA_METADATA>
+  <HISTORY saga-version="2.3.1">
+    <MODULE library="shapes_polygons" id="14" name="Intersect">
+      <OPTION type="boolean" id="SPLIT" name="Split Parts">TRUE</OPTION>
+      <INPUT type="shapes" id="A" name="Layer A">
+        <FILE>/tmp/processing_a4e6a4a6b82a483f8e8c419a452089a0/1f232bc285c34fdf88d633e407a0010e/A.shp</FILE>
+      </INPUT>
+      <INPUT type="shapes" id="B" name="Layer B">
+        <FILE>/tmp/processing_a4e6a4a6b82a483f8e8c419a452089a0/064f65665fa1433ea0fece6da36666df/B.shp</FILE>
+      </INPUT>
+      <OUTPUT type="shapes" id="RESULT" name="Intersect">Intersect [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>
diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.prj b/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.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"]]
diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.shp b/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.shp
diff --git a/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.shx b/python/plugins/processing/tests/testdata/expected/saga/polygon_intersect.shx
diff --git a/python/plugins/processing/tests/testdata/saga_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/saga_algorithm_tests.yaml
@@ -331,3 +331,18 @@ tests:
         name: expected/saga/polygon_symmetrical_difference.shp
         type: vector
 
+  - algorithm: saga:intersect
+    name: Polygon intersect
+    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_intersect.shp
+        type: vector
+