Merge pull request #26 from geo-engine/queryrec_camel

query rectangle to camelCase

Author: jdroenner

geoengine/types.py

@@ -154,7 +154,7 @@ def __dict__(self) -> Dict[str, Any]:
         # TODO: distinguish between raster, vector and plot query rectangle
 
         return {
-            'spatial_bounds': {
+            'spatialBounds': {
                 'upperLeftCoordinate': {
                     "x": left_x,
                     "y": upper_y,
@@ -164,11 +164,11 @@ def __dict__(self) -> Dict[str, Any]:
                     "y": lower_y,
                 }
             },
-            'time_interval': {
+            'timeInterval': {
                 'start': time_start_unix,
                 'end': time_end_unix,
             },
-            'spatial_resolution': {
+            'spatialResolution': {
                 'x': self.__resolution[0],
                 'y': self.__resolution[1],
             },

tests/test_workflow_storage.py

@@ -2,6 +2,7 @@
 
 from datetime import datetime
 import unittest
+import json
 
 import requests_mock
 
@@ -43,6 +44,29 @@ def test_storing_workflow(self):
                   request_headers={'Authorization': 'Bearer c4983c3e-9b53-47ae-bda9-382223bd5081'})
 
             m.post('http://mock-instance/datasetFromWorkflow/5b9508a8-bd34-5a1c-acd6-75bb832d2d38',
+                   additional_matcher=lambda request: request.text == json.dumps({
+                       "name": "Foo",
+                       "description": "Bar",
+                       "query": {
+                           "spatialBounds": {
+                               "upperLeftCoordinate": {
+                                   "x": -180.0,
+                                   "y": 90.0},
+                               "lowerRightCoordinate": {
+                                   "x": 180.0,
+                                   "y": -90.0
+                               }
+                           },
+                           "timeInterval": {
+                               "start": 1396353600000,
+                               "end": 1396353600000
+                           },
+                           "spatialResolution": {
+                               "x": 1.8,
+                               "y": 1.8
+                           }
+                       }
+                   }),
                    json={
                        "upload": "3086f494-d5a4-4b51-a14b-3b29f8bf7bb0",
                        "dataset": {