fix JSON encoding of CRS type (#610) (#650)

* Fixed the JSON encoding of the CRS type which crashed when the execution request was serialized

* Fixed the JSON encoding of the CRS type by making sure the CRS is always set as string when parsing input
Also added tests

* Changed converting the string conversion of the crs input to calling the getcodeurn() method directly

* Now setting bbox CRS handles None values properly

Author: geotom

pywps/app/WPSRequest.py

@@ -575,7 +575,7 @@ def get_inputs_from_xml(doc):
                 inpt = {}
                 inpt['identifier'] = identifier_el.text
                 inpt['data'] = [bbox.minx, bbox.miny, bbox.maxx, bbox.maxy]
-                inpt['crs'] = bbox.crs
+                inpt['crs'] = bbox.crs.getcodeurn() if bbox.crs else None
                 inpt['dimensions'] = bbox.dimensions
                 the_inputs[identifier].append(inpt)
     return the_inputs

tests/processes/__init__.py

@@ -4,7 +4,7 @@
 ##################################################################
 
 from pywps import Process
-from pywps.inout import LiteralInput, LiteralOutput
+from pywps.inout import LiteralInput, LiteralOutput, BoundingBoxInput, BoundingBoxOutput
 from pywps.inout.literaltypes import ValuesReference
 
 
@@ -71,3 +71,31 @@ def inout(request, response):
         a_string = request.inputs['string'][0].data
         response.outputs['string'].data = "".format(a_string)
         return response
+
+
+class BBox(Process):
+    def __init__(self):
+        super(BBox, self).__init__(
+            self.bbox,
+            identifier='bbox_test',
+            title='BBox Test',
+            inputs=[
+                BoundingBoxInput(
+                    'area',
+                    'An area',
+                    abstract='Define the area of interest',
+                    crss=['epsg:4326', 'epsg:3857'],
+                    min_occurs=1,
+                    max_occurs=1
+                ),
+            ],
+            outputs=[
+                BoundingBoxOutput('extent', 'Extent', crss=['epsg:4326', 'epsg:3857'])
+            ]
+        )
+
+    @staticmethod
+    def bbox(request, response):
+        area = request.inputs['area'][0].data
+        response.outputs['extent'].data = area
+        return response

tests/test_processing.py

@@ -18,7 +18,7 @@
 from pywps.app import WPSRequest
 from pywps.response.execute import ExecuteResponse
 
-from .processes import Greeter, InOut
+from .processes import Greeter, InOut, BBox
 
 
 class GreeterProcessingTest(unittest.TestCase):
@@ -97,13 +97,47 @@ def test_job_dump(self):
         self.assertEqual(new_job.json, self.job.json)  # idempotent test
 
 
+class BBoxProcessingTest(unittest.TestCase):
+    """Processing test case with BBox input and output process"""
+
+    def setUp(self):
+        self.uuid = uuid.uuid1()
+        self.dummy_process = BBox()
+        self.dummy_process._set_uuid(self.uuid)
+        self.dummy_process.set_workdir('/tmp')
+        self.wps_request = WPSRequest()
+        self.wps_response = ExecuteResponse(self.wps_request, self.uuid,
+                                            process=self.dummy_process)
+        self.job = Job(
+            process=self.dummy_process,
+            wps_request=self.wps_request,
+            wps_response=self.wps_response)
+
+    def test_job_json(self):
+        new_job = Job.from_json(json.loads(self.job.json))
+        self.assertEqual(new_job.name, 'bbox_test')
+        self.assertEqual(new_job.uuid, str(self.uuid))
+        self.assertEqual(new_job.workdir, '/tmp')
+        self.assertEqual(len(new_job.process.inputs), 1)
+        self.assertEqual(new_job.json, self.job.json)  # idempotent test
+
+    def test_job_dump(self):
+        new_job = Job.load(self.job.dump())
+        self.assertEqual(new_job.name, 'bbox_test')
+        self.assertEqual(new_job.uuid, str(self.uuid))
+        self.assertEqual(new_job.workdir, '/tmp')
+        self.assertEqual(len(new_job.process.inputs), 1)
+        self.assertEqual(new_job.json, self.job.json)  # idempotent test
+
+
 def load_tests(loader=None, tests=None, pattern=None):
     """Load local tests
     """
     if not loader:
         loader = unittest.TestLoader()
     suite_list = [
         loader.loadTestsFromTestCase(GreeterProcessingTest),
-        loader.loadTestsFromTestCase(InOutProcessingTest)
+        loader.loadTestsFromTestCase(InOutProcessingTest),
+        loader.loadTestsFromTestCase(BBoxProcessingTest)
     ]
     return unittest.TestSuite(suite_list)

tests/test_wpsrequest.py

@@ -8,6 +8,7 @@
 import tempfile
 import datetime
 import json
+from owslib.crs import Crs
 
 from pywps.inout.literaltypes import AnyValue
 
@@ -116,6 +117,46 @@ def test_json_inout_datetime(self):
         self.assertEqual(self.request.inputs['date'][0].data, datetime.date(2017, 4, 20), 'Data set')
         self.assertEqual(self.request.inputs['time'][0].data, datetime.time(9, 0, 0), 'Time set')
 
+    def test_json_inout_bbox(self):
+        obj = {
+            'operation': 'getcapabilities',
+            'version': '1.0.0',
+            'language': 'eng',
+            'identifier': 'arghhhh',
+            'identifiers': 'arghhhh',  # TODO: why identifierS?
+            'store_execute': True,
+            'status': True,
+            'lineage': True,
+            'inputs': {
+                'bbox': [{
+                    'identifier': 'bbox',
+                    'type': 'bbox',
+                    'bbox': '6.117602,46.176194,6.22283,46.275832',
+                    'crs': 'urn:ogc:def:crs:EPSG::4326',
+                    'crss': ['epsg:4326'],
+                    'dimensions': 2,
+                    'translations': None
+                }],
+            },
+            'outputs': {},
+            'raw': False
+        }
+
+        self.request = WPSRequest()
+        self.request.json = obj
+
+        self.assertEqual(self.request.inputs['bbox'][0].data, [6.117602, 46.176194, 6.22283, 46.275832], 'BBox data set')
+        self.assertTrue(isinstance(self.request.inputs['bbox'][0].crs, str), 'CRS is a string')
+        self.assertEqual(self.request.inputs['bbox'][0].crs, 'epsg:4326', 'CRS data correctly parsed')
+
+        # dump to json and reload
+        dump = self.request.json
+        self.request.json = json.loads(dump)
+
+        self.assertEqual(self.request.inputs['bbox'][0].data, [6.117602, 46.176194, 6.22283, 46.275832], 'BBox data set')
+        self.assertTrue(isinstance(self.request.inputs['bbox'][0].crs, str), 'CRS is a string')
+        self.assertEqual(self.request.inputs['bbox'][0].crs, 'epsg:4326', 'CRS data correctly parsed')
+
 
 def load_tests(loader=None, tests=None, pattern=None):
     if not loader: