[processing][grass] Fix v.net.* output types, add tests

Fixes #19186
qgis · Jul 25, 2018 · 28c4a6cf592714609f715e6e16f6b7a415fb6ae6 · 28c4a6c
1 parent eca775f
commit 28c4a6cf592714609f715e6e16f6b7a415fb6ae6
diff --git a/python/plugins/processing/algs/grass7/ext/v_net.py b/python/plugins/processing/algs/grass7/ext/v_net.py
@@ -100,11 +100,19 @@ def variableOutput(alg, layers, parameters, context, nocats=True):
         if not isinstance(typeList, list):
             continue
 
-        fileName = alg.parameterAsOutputLayer(parameters, outputName, context)
-        grassName = '{}{}'.format(typeList[0], alg.uniqueSuffix)
-        alg.exportVectorLayer(
-            grassName, fileName, typeList[1], typeList[2],
-            typeList[3])
+        file_name = alg.parameterAsOutputLayer(parameters, outputName, context)
+
+        src_layer = typeList[0]
+        output_type = typeList[1]
+        output_layer_number = typeList[2]
+        no_cats = typeList[3]
+
+        grass_name = '{}{}'.format(src_layer, alg.uniqueSuffix)
+        alg.exportVectorLayer(grassName=grass_name,
+                              fileName=file_name,
+                              layer=output_layer_number,
+                              nocats=no_cats,
+                              dataType=output_type)
 
 
 def processOutputs(alg, parameters, context, feedback):

diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network.cpg b/python/plugins/processing/tests/testdata/custom/grass7/network.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network.dbf b/python/plugins/processing/tests/testdata/custom/grass7/network.dbf
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network.prj b/python/plugins/processing/tests/testdata/custom/grass7/network.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_35S",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["Meter",1]]
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network.qpj b/python/plugins/processing/tests/testdata/custom/grass7/network.qpj
@@ -0,0 +1 @@
+PROJCS["WGS 84 / UTM zone 35S",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["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32735"]]
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network.shp b/python/plugins/processing/tests/testdata/custom/grass7/network.shp
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network.shx b/python/plugins/processing/tests/testdata/custom/grass7/network.shx
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network_points.cpg b/python/plugins/processing/tests/testdata/custom/grass7/network_points.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network_points.dbf b/python/plugins/processing/tests/testdata/custom/grass7/network_points.dbf
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network_points.prj b/python/plugins/processing/tests/testdata/custom/grass7/network_points.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_35S",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["Meter",1]]
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network_points.qpj b/python/plugins/processing/tests/testdata/custom/grass7/network_points.qpj
@@ -0,0 +1 @@
+PROJCS["WGS 84 / UTM zone 35S",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["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32735"]]
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network_points.shp b/python/plugins/processing/tests/testdata/custom/grass7/network_points.shp
diff --git a/python/plugins/processing/tests/testdata/custom/grass7/network_points.shx b/python/plugins/processing/tests/testdata/custom/grass7/network_points.shx
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_allpairs.dbf b/python/plugins/processing/tests/testdata/expected/grass7/v_net_allpairs.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_allpairs.prj b/python/plugins/processing/tests/testdata/expected/grass7/v_net_allpairs.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_35S",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["Meter",1]]
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_allpairs.shp b/python/plugins/processing/tests/testdata/expected/grass7/v_net_allpairs.shp
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_allpairs.shx b/python/plugins/processing/tests/testdata/expected/grass7/v_net_allpairs.shx
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_centrality.dbf b/python/plugins/processing/tests/testdata/expected/grass7/v_net_centrality.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_centrality.prj b/python/plugins/processing/tests/testdata/expected/grass7/v_net_centrality.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_35S",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["Meter",1]]
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_centrality.shp b/python/plugins/processing/tests/testdata/expected/grass7/v_net_centrality.shp
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_centrality.shx b/python/plugins/processing/tests/testdata/expected/grass7/v_net_centrality.shx
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_salesman.dbf b/python/plugins/processing/tests/testdata/expected/grass7/v_net_salesman.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_salesman.prj b/python/plugins/processing/tests/testdata/expected/grass7/v_net_salesman.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_35S",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["Meter",1]]
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_salesman.shp b/python/plugins/processing/tests/testdata/expected/grass7/v_net_salesman.shp
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_salesman.shx b/python/plugins/processing/tests/testdata/expected/grass7/v_net_salesman.shx
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_steiner.dbf b/python/plugins/processing/tests/testdata/expected/grass7/v_net_steiner.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_steiner.prj b/python/plugins/processing/tests/testdata/expected/grass7/v_net_steiner.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_35S",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["Meter",1]]
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_steiner.shp b/python/plugins/processing/tests/testdata/expected/grass7/v_net_steiner.shp
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_net_steiner.shx b/python/plugins/processing/tests/testdata/expected/grass7/v_net_steiner.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
@@ -139,3 +139,107 @@ tests:
       output:
         name: expected/grass7/v_vect_stats.shp
         type: vector
+
+  - algorithm: grass7:v.net.allpairs
+    name: v.net.allpairs
+    params:
+      -g: false
+      GRASS_MIN_AREA_PARAMETER: 0.0001
+      GRASS_OUTPUT_TYPE_PARAMETER: 0
+      GRASS_SNAP_TOLERANCE_PARAMETER: -1.0
+      GRASS_VECTOR_DSCO: ''
+      GRASS_VECTOR_LCO: ''
+      cats: 1-10000
+      input:
+        name: custom/grass7/network.shp
+        type: vector
+      points:
+        name: custom/grass7/network_points.shp
+        type: vector
+      threshold: 50.0
+      where: ''
+    results:
+      output:
+        name: expected/grass7/v_net_allpairs.shp
+        type: vector
+
+  - algorithm: grass7:v.net.centrality
+    name: v.net.centrality
+    params:
+      -a: true
+      -g: false
+      GRASS_MIN_AREA_PARAMETER: 0.0001
+      GRASS_OUTPUT_TYPE_PARAMETER: 0
+      GRASS_SNAP_TOLERANCE_PARAMETER: -1.0
+      GRASS_VECTOR_DSCO: ''
+      GRASS_VECTOR_LCO: ''
+      betweenness: ''
+      cats: ''
+      closeness: closeness
+      degree: degree
+      eigenvector: ''
+      error: 0.1
+      input:
+        name: custom/grass7/network.shp
+        type: vector
+      iterations: 1000
+      points:
+        name: custom/grass7/network_points.shp
+        type: vector
+      threshold: 50.0
+      where: ''
+    results:
+      output:
+        name: expected/grass7/v_net_centrality.shp
+        type: vector
+
+  - algorithm: grass7:v.net.salesman
+    name: v.net.salesman
+    params:
+      -g: false
+      GRASS_MIN_AREA_PARAMETER: 0.0001
+      GRASS_OUTPUT_TYPE_PARAMETER: 0
+      GRASS_SNAP_TOLERANCE_PARAMETER: -1.0
+      GRASS_VECTOR_DSCO: ''
+      GRASS_VECTOR_LCO: ''
+      arc_type:
+      - 0
+      - 1
+      center_cats: 1-100000
+      input:
+        name: custom/grass7/network.shp
+        type: vector
+      points:
+        name: custom/grass7/network_points.shp
+        type: vector
+      threshold: 50.0
+    results:
+      output:
+        name: expected/grass7/v_net_salesman.shp
+        type: vector
+
+  - algorithm: grass7:v.net.steiner
+    name: v.net.steiner
+    params:
+      -g: false
+      GRASS_MIN_AREA_PARAMETER: 0.0001
+      GRASS_OUTPUT_TYPE_PARAMETER: 0
+      GRASS_SNAP_TOLERANCE_PARAMETER: -1.0
+      GRASS_VECTOR_DSCO: ''
+      GRASS_VECTOR_LCO: ''
+      arc_type:
+      - 0
+      - 1
+      input:
+        name: custom/grass7/network.shp
+        type: vector
+      npoints: -1
+      points:
+        name: custom/grass7/network_points.shp
+        type: vector
+      terminal_cats: 1-100000
+      threshold: 50.0
+    results:
+      output:
+        name: expected/grass7/v_net_steiner.shp
+        type: vector
		@@ -0,0 +1 @@
		PROJCS["WGS_1984_UTM_Zone_35S",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["Meter",1]]
		@@ -0,0 +1 @@
		PROJCS["WGS 84 / UTM zone 35S",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["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",10000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32735"]]