[processing][grass] Fix v.what.rast data type, add test

qgis · Jul 25, 2018 · 0c56d00c01c8d8d36a4c79a42c9dcf8458296808 · 0c56d00
1 parent 71f880b
commit 0c56d00c01c8d8d36a4c79a42c9dcf8458296808
diff --git a/python/plugins/processing/algs/grass7/ext/v_what_rast.py b/python/plugins/processing/algs/grass7/ext/v_what_rast.py
@@ -36,4 +36,4 @@ def processOutputs(alg, parameters, context, feedback):
     fileName = alg.parameterAsOutputLayer(parameters, 'output', context)
     grassName = alg.exportedLayers['map']
     dataType = 'auto'
-    alg.exportVectorLayer(grassName, fileName, dataType)
+    alg.exportVectorLayer(grassName, fileName, dataType=dataType)
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/sample_points.cpg b/python/plugins/processing/tests/testdata/custom/grass7/sample_points.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/sample_points.dbf b/python/plugins/processing/tests/testdata/custom/grass7/sample_points.dbf
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/sample_points.prj b/python/plugins/processing/tests/testdata/custom/grass7/sample_points.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/sample_points.qpj b/python/plugins/processing/tests/testdata/custom/grass7/sample_points.qpj
@@ -0,0 +1 @@
+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"]]
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/sample_points.shp b/python/plugins/processing/tests/testdata/custom/grass7/sample_points.shp
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/sample_points.shx b/python/plugins/processing/tests/testdata/custom/grass7/sample_points.shx
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_what_rast.dbf b/python/plugins/processing/tests/testdata/expected/grass7/v_what_rast.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_what_rast.prj b/python/plugins/processing/tests/testdata/expected/grass7/v_what_rast.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_what_rast.shp b/python/plugins/processing/tests/testdata/expected/grass7/v_what_rast.shp
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_what_rast.shx b/python/plugins/processing/tests/testdata/expected/grass7/v_what_rast.shx
diff --git a/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml b/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml
@@ -91,3 +91,26 @@ tests:
         name: expected/grass7/v_voronoi.shp
         type: vector
 
+  - algorithm: grass7:v.what.rast
+    name: v.what.rast
+    params:
+      -i: false
+      GRASS_MIN_AREA_PARAMETER: 0.0001
+      GRASS_OUTPUT_TYPE_PARAMETER: 0
+      GRASS_REGION_CELLSIZE_PARAMETER: 0.0
+      GRASS_SNAP_TOLERANCE_PARAMETER: -1.0
+      GRASS_VECTOR_DSCO: ''
+      GRASS_VECTOR_LCO: ''
+      column: val
+      map:
+        name: custom/grass7/sample_points.shp
+        type: vector
+      raster:
+        name: dem.tif
+        type: raster
+      type: 0
+      where: ''
+    results:
+      output:
+        name: expected/grass7/v_what_rast.shp
+        type: vector
		@@ -0,0 +1 @@
		GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
		@@ -0,0 +1 @@
		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"]]