mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-20 00:06:36 -04:00
[processing][SAGA] Fix interpolation choices for add grid values algorithms
And add more tests Fixes #19132
This commit is contained in:
parent
4444428133
commit
77786f38c3
@ -2,6 +2,6 @@ Add Grid Values to Points
|
|||||||
shapes_grid
|
shapes_grid
|
||||||
QgsProcessingParameterFeatureSource|SHAPES|Points|0|None|False
|
QgsProcessingParameterFeatureSource|SHAPES|Points|0|None|False
|
||||||
QgsProcessingParameterMultipleLayers|GRIDS|Grids|3|None|False
|
QgsProcessingParameterMultipleLayers|GRIDS|Grids|3|None|False
|
||||||
QgsProcessingParameterEnum|RESAMPLING|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
|
QgsProcessingParameterEnum|RESAMPLING|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Bicubic Spline Interpolation;[3] B-Spline Interpolation
|
||||||
QgsProcessingParameterVectorDestination|RESULT|Result
|
QgsProcessingParameterVectorDestination|RESULT|Result
|
||||||
AllowUnmatching
|
AllowUnmatching
|
||||||
|
@ -2,6 +2,6 @@ Add Grid Values to Shapes
|
|||||||
shapes_grid
|
shapes_grid
|
||||||
QgsProcessingParameterFeatureSource|SHAPES|Shapes|-1|None|False
|
QgsProcessingParameterFeatureSource|SHAPES|Shapes|-1|None|False
|
||||||
QgsProcessingParameterMultipleLayers|GRIDS|Grids|3|None|False
|
QgsProcessingParameterMultipleLayers|GRIDS|Grids|3|None|False
|
||||||
QgsProcessingParameterEnum|RESAMPLING|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
|
QgsProcessingParameterEnum|RESAMPLING|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Bicubic Spline Interpolation;[3] B-Spline Interpolation
|
||||||
QgsProcessingParameterVectorDestination|RESULT|Result
|
QgsProcessingParameterVectorDestination|RESULT|Result
|
||||||
AllowUnmatching
|
AllowUnmatching
|
||||||
|
1
python/plugins/processing/tests/testdata/custom/lines_over.cpg
vendored
Normal file
1
python/plugins/processing/tests/testdata/custom/lines_over.cpg
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
UTF-8
|
BIN
python/plugins/processing/tests/testdata/custom/lines_over.dbf
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/custom/lines_over.dbf
vendored
Normal file
Binary file not shown.
1
python/plugins/processing/tests/testdata/custom/lines_over.prj
vendored
Normal file
1
python/plugins/processing/tests/testdata/custom/lines_over.prj
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
|
1
python/plugins/processing/tests/testdata/custom/lines_over.qpj
vendored
Normal file
1
python/plugins/processing/tests/testdata/custom/lines_over.qpj
vendored
Normal file
@ -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"]]
|
BIN
python/plugins/processing/tests/testdata/custom/lines_over.shp
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/custom/lines_over.shp
vendored
Normal file
Binary file not shown.
BIN
python/plugins/processing/tests/testdata/custom/lines_over.shx
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/custom/lines_over.shx
vendored
Normal file
Binary file not shown.
BIN
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.dbf
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.dbf
vendored
Normal file
Binary file not shown.
29
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.mshp
vendored
Normal file
29
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.mshp
vendored
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<SAGA_METADATA>
|
||||||
|
<HISTORY saga-version="2.3.1">
|
||||||
|
<MODULE library="shapes_grid" id="1" name="Add Grid Values to Shapes">
|
||||||
|
<OPTION type="choice" id="RESAMPLING" name="Resampling" index="0">Nearest Neighbour</OPTION>
|
||||||
|
<INPUT type="shapes" id="SHAPES" name="Shapes">
|
||||||
|
<FILE>/home/nyall/dev/QGIS/python/plugins/processing/tests/testdata/custom/lines_over.shp</FILE>
|
||||||
|
</INPUT>
|
||||||
|
<INPUT_LIST type="grid_list" id="GRIDS" name="Grids">
|
||||||
|
<dem type="grid_list" id="GRIDS" name="Grids">
|
||||||
|
<FILE>/tmp/processing_f0fd76cf1e1e4c69bab137429bd6084c/a59bb63955554f778856866bbe0bca17/dem.sgrd</FILE>
|
||||||
|
</dem>
|
||||||
|
</INPUT_LIST>
|
||||||
|
<OUTPUT type="shapes" id="RESULT" name="Result">lines_over</OUTPUT>
|
||||||
|
</MODULE>
|
||||||
|
</HISTORY>
|
||||||
|
<SOURCE>
|
||||||
|
<FILE></FILE>
|
||||||
|
<DATABASE>
|
||||||
|
<FIELDS>
|
||||||
|
<FIELD TYPE="LONGINT">id</FIELD>
|
||||||
|
<FIELD TYPE="STRING">name</FIELD>
|
||||||
|
<FIELD TYPE="DOUBLE">dem</FIELD>
|
||||||
|
</FIELDS>
|
||||||
|
</DATABASE>
|
||||||
|
<PROJECTION></PROJECTION>
|
||||||
|
</SOURCE>
|
||||||
|
<DESCRIPTION></DESCRIPTION>
|
||||||
|
</SAGA_METADATA>
|
1
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.prj
vendored
Normal file
1
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.prj
vendored
Normal file
@ -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"]]
|
BIN
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.shp
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.shp
vendored
Normal file
Binary file not shown.
BIN
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.shx
vendored
Normal file
BIN
python/plugins/processing/tests/testdata/expected/saga/add_grid_to_shapes.shx
vendored
Normal file
Binary file not shown.
@ -46,6 +46,23 @@ tests:
|
|||||||
name: expected/saga/add_grid_to_points.shp
|
name: expected/saga/add_grid_to_points.shp
|
||||||
type: vector
|
type: vector
|
||||||
|
|
||||||
|
- algorithm: saga:addrastervaluestofeatures
|
||||||
|
name: Add raster values to shapes
|
||||||
|
params:
|
||||||
|
GRIDS:
|
||||||
|
params:
|
||||||
|
- name: dem.tif
|
||||||
|
type: raster
|
||||||
|
type: multi
|
||||||
|
RESAMPLING: 0
|
||||||
|
SHAPES:
|
||||||
|
name: custom/lines_over.shp
|
||||||
|
type: vector
|
||||||
|
results:
|
||||||
|
RESULT:
|
||||||
|
name: expected/saga/add_grid_to_shapes.shp
|
||||||
|
type: vector
|
||||||
|
|
||||||
- algorithm: saga:mergevectorlayers
|
- algorithm: saga:mergevectorlayers
|
||||||
name: Merge vector layers
|
name: Merge vector layers
|
||||||
params:
|
params:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user