v2.1.1 - update xyz.py

Author: idanmiara

VERSION.txt

@@ -1 +1 @@
-2.1.0
+2.1.1

processes/io_generator.py

@@ -273,10 +273,14 @@ def fake_raster(defaults):
     ]
 
 
-def skip_ndv(defaults):
+def skip_src_dst_nodata(defaults):
     return [
-        LiteralInputD(defaults, 'skip_ndv', 'skip NoData values', data_type='boolean', min_occurs=1, max_occurs=1,
-                      default=True),
+        LiteralInputD(defaults, 'skip_nodata', 'skip NoData values',
+                      data_type='boolean', min_occurs=1, max_occurs=1, default=True),
+        LiteralInputD(defaults, 'src_nodata', 'override source NoData values',
+                      data_type='float', min_occurs=0, max_occurs=1),
+        LiteralInputD(defaults, 'dst_nodata', 'replace source NoData values with the given destination NoData values',
+                      data_type='float', min_occurs=0, max_occurs=1),
     ]
 
 

processes/trans.py

@@ -43,7 +43,7 @@ def _handler(self, request, response: ExecuteResponse):
         output_filename = tempfile.mktemp(suffix=ext)
         raster_filename = process_helper.get_request_data(request.inputs, 'r')
         if of == 'xyz':
-            gdal2xyz(raster_filename, output_filename, skip_no_data=True)
+            gdal2xyz(raster_filename, output_filename, skip_nodata=True)
         else:
             gdalos_trans(raster_filename, of=of, out_filename=output_filename)
 

processes/xyz.py

@@ -19,10 +19,10 @@ def __init__(self):
 
         inputs = \
             iog.raster_input(defaults) + \
-            iog.skip_ndv(defaults)
+            iog.skip_src_dst_nodata(defaults)
 
         outputs = iog.output_r() + \
-                  iog.output_value(['x', 'y', 'z'])
+                  iog.output_value(['x', 'y', 'z', 'nodata'])
 
         super().__init__(
             self._handler,
@@ -40,11 +40,16 @@ def __init__(self):
 
     def _handler(self, request, response: ExecuteResponse):
         raster_filename = process_helper.get_request_data(request.inputs, 'r')
-        skip_ndv = request.inputs['skip_ndv'][0].data
-        x, y, z = gdal2xyz(raster_filename, None, return_np_arrays=True, skip_no_data=skip_ndv)
+        skip_nodata = process_helper.get_request_data(request.inputs, 'skip_nodata')
+        src_nodata = process_helper.get_request_data(request.inputs, 'src_nodata')
+        dst_nodata = process_helper.get_request_data(request.inputs, 'dst_nodata')
+        x, y, z, nodata = gdal2xyz(raster_filename, None, return_np_arrays=True,
+                                   skip_nodata=skip_nodata, src_nodata=src_nodata, dst_nodata=dst_nodata)
 
         response.outputs['r'].data = raster_filename
 
+        response.outputs['nodata'].data = nodata
+
         response.outputs['x'].output_format = FORMATS.JSON
         response.outputs['y'].output_format = FORMATS.JSON
         response.outputs['z'].output_format = FORMATS.JSON

requirements.txt

@@ -14,4 +14,5 @@ numpy<=1.19.3
 pywps-json>=4.2.9.6
 czml3>=0.5.4
 gdalos>=0.50.0
+gdal-utils>=3.3.0.4
 gdal>=3.0.0