[FEATURE][processing] New algorithms "Extract Z values" and "Extract …

…m values" These algorithms allow users to convert z or m values present in feature geometries to attributes in the layer. By default the z/m value from the first vertex in the feature is extracted, but optionally statistics can be calculated on ALL the z/m values from the geometry (e.g. calculating mean/min/max/sum/etc of z values).
qgis · Jan 3, 2019 · cef9c4e · cef9c4e
1 parent e99072b
commit cef9c4e
Show file tree

Hide file tree

Showing 45 changed files with 545 additions and 0 deletions.
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_all.dbf b/python/plugins/processing/tests/testdata/expected/extract_m_all.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_all.prj b/python/plugins/processing/tests/testdata/expected/extract_m_all.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/extract_m_all.qpj b/python/plugins/processing/tests/testdata/expected/extract_m_all.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/expected/extract_m_all.shp b/python/plugins/processing/tests/testdata/expected/extract_m_all.shp
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_all.shx b/python/plugins/processing/tests/testdata/expected/extract_m_all.shx
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_first.dbf b/python/plugins/processing/tests/testdata/expected/extract_m_first.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_first.prj b/python/plugins/processing/tests/testdata/expected/extract_m_first.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/extract_m_first.qpj b/python/plugins/processing/tests/testdata/expected/extract_m_first.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/expected/extract_m_first.shp b/python/plugins/processing/tests/testdata/expected/extract_m_first.shp
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_first.shx b/python/plugins/processing/tests/testdata/expected/extract_m_first.shx
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_none.dbf b/python/plugins/processing/tests/testdata/expected/extract_m_none.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_none.prj b/python/plugins/processing/tests/testdata/expected/extract_m_none.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/extract_m_none.qpj b/python/plugins/processing/tests/testdata/expected/extract_m_none.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/expected/extract_m_none.shp b/python/plugins/processing/tests/testdata/expected/extract_m_none.shp
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_none.shx b/python/plugins/processing/tests/testdata/expected/extract_m_none.shx
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_points.dbf b/python/plugins/processing/tests/testdata/expected/extract_m_points.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_points.prj b/python/plugins/processing/tests/testdata/expected/extract_m_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/expected/extract_m_points.qpj b/python/plugins/processing/tests/testdata/expected/extract_m_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/expected/extract_m_points.shp b/python/plugins/processing/tests/testdata/expected/extract_m_points.shp
diff --git a/python/plugins/processing/tests/testdata/expected/extract_m_points.shx b/python/plugins/processing/tests/testdata/expected/extract_m_points.shx
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_all.dbf b/python/plugins/processing/tests/testdata/expected/extract_z_all.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_all.prj b/python/plugins/processing/tests/testdata/expected/extract_z_all.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/extract_z_all.qpj b/python/plugins/processing/tests/testdata/expected/extract_z_all.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/expected/extract_z_all.shp b/python/plugins/processing/tests/testdata/expected/extract_z_all.shp
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_all.shx b/python/plugins/processing/tests/testdata/expected/extract_z_all.shx
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_first.dbf b/python/plugins/processing/tests/testdata/expected/extract_z_first.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_first.prj b/python/plugins/processing/tests/testdata/expected/extract_z_first.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/extract_z_first.qpj b/python/plugins/processing/tests/testdata/expected/extract_z_first.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/expected/extract_z_first.shp b/python/plugins/processing/tests/testdata/expected/extract_z_first.shp
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_first.shx b/python/plugins/processing/tests/testdata/expected/extract_z_first.shx
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_none.dbf b/python/plugins/processing/tests/testdata/expected/extract_z_none.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_none.prj b/python/plugins/processing/tests/testdata/expected/extract_z_none.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/extract_z_none.qpj b/python/plugins/processing/tests/testdata/expected/extract_z_none.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/expected/extract_z_none.shp b/python/plugins/processing/tests/testdata/expected/extract_z_none.shp
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_none.shx b/python/plugins/processing/tests/testdata/expected/extract_z_none.shx
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_points.dbf b/python/plugins/processing/tests/testdata/expected/extract_z_points.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_points.prj b/python/plugins/processing/tests/testdata/expected/extract_z_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/expected/extract_z_points.qpj b/python/plugins/processing/tests/testdata/expected/extract_z_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/expected/extract_z_points.shp b/python/plugins/processing/tests/testdata/expected/extract_z_points.shp
diff --git a/python/plugins/processing/tests/testdata/expected/extract_z_points.shx b/python/plugins/processing/tests/testdata/expected/extract_z_points.shx
diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
@@ -6430,6 +6430,178 @@ tests:
         name: expected/force_rhr_multipolys.gml
         type: vector
 
+  - algorithm: native:extractzvalues
+    name: Extract z, first value only
+    params:
+      COLUMN_PREFIX: z_
+      INPUT:
+        name: lines_z.shp
+        type: vector
+      SUMMARIES:
+      - 0
+    results:
+      OUTPUT:
+        name: expected/extract_z_first.shp
+        type: vector
+
+  - algorithm: native:extractzvalues
+    name: Extract z, all stats
+    params:
+      COLUMN_PREFIX: zs_
+      INPUT:
+        name: lines_z.shp
+        type: vector
+      SUMMARIES:
+      - 0
+      - 1
+      - 2
+      - 3
+      - 4
+      - 5
+      - 6
+      - 7
+      - 8
+      - 9
+      - 10
+      - 11
+      - 12
+      - 13
+      - 14
+      - 15
+    results:
+      OUTPUT:
+        name: expected/extract_z_all.shp
+        type: vector
+
+  - algorithm: native:extractzvalues
+    name: Extract z, points
+    params:
+      COLUMN_PREFIX: z_
+      INPUT:
+        name: custom/pointszm.shp
+        type: vector
+      SUMMARIES:
+      - 0
+      - 1
+      - 2
+      - 3
+      - 4
+      - 5
+      - 6
+      - 7
+      - 8
+      - 9
+      - 10
+      - 11
+      - 12
+      - 13
+      - 14
+      - 15
+    results:
+      OUTPUT:
+        name: expected/extract_z_points.shp
+        type: vector
+
+  - algorithm: native:extractzvalues
+    name: Extract z, no z values
+    params:
+      COLUMN_PREFIX: z_
+      INPUT:
+        name: lines.gml|layername=lines
+        type: vector
+      SUMMARIES:
+      - 0
+    results:
+      OUTPUT:
+        name: expected/extract_z_none.shp
+        type: vector
+
+  - algorithm: native:extractmvalues
+    name: Extract m first only
+    params:
+      COLUMN_PREFIX: m_
+      INPUT:
+        name: lines_m.shp
+        type: vector
+      SUMMARIES:
+      - 0
+    results:
+      OUTPUT:
+        name: expected/extract_m_first.shp
+        type: vector
+
+  - algorithm: native:extractmvalues
+    name: Extract m, all stats
+    params:
+      COLUMN_PREFIX: ms_
+      INPUT:
+        name: lines_m.shp
+        type: vector
+      SUMMARIES:
+      - 0
+      - 1
+      - 2
+      - 3
+      - 4
+      - 5
+      - 6
+      - 7
+      - 8
+      - 9
+      - 10
+      - 11
+      - 12
+      - 13
+      - 14
+      - 15
+    results:
+      OUTPUT:
+        name: expected/extract_m_all.shp
+        type: vector
+
+  - algorithm: native:extractmvalues
+    name: Extract m, points
+    params:
+      COLUMN_PREFIX: mp_
+      INPUT:
+        name: custom/pointszm.shp
+        type: vector
+      SUMMARIES:
+      - 0
+      - 1
+      - 2
+      - 3
+      - 4
+      - 5
+      - 6
+      - 7
+      - 8
+      - 9
+      - 10
+      - 11
+      - 12
+      - 13
+      - 14
+      - 15
+    results:
+      OUTPUT:
+        name: expected/extract_m_points.shp
+        type: vector
+
+  - algorithm: native:extractmvalues
+    name: Extract m, no m values present
+    params:
+      COLUMN_PREFIX: m_
+      INPUT:
+        name: points.gml|layername=points
+        type: vector
+      SUMMARIES:
+      - 0
+    results:
+      OUTPUT:
+        name: expected/extract_m_none.shp
+        type: vector
+
   - algorithm: native:splitlinesbylength
     name: Split multilines by length
     params:

diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -46,6 +46,7 @@ SET(QGIS_ANALYSIS_SRCS
   processing/qgsalgorithmextractbyexpression.cpp
   processing/qgsalgorithmextractbyextent.cpp
   processing/qgsalgorithmextractbylocation.cpp
+  processing/qgsalgorithmextractzmvalues.cpp
   processing/qgsalgorithmextractvertices.cpp
   processing/qgsalgorithmfiledownloader.cpp
   processing/qgsalgorithmfilter.cpp