Merge #38

38: fix wrong srs error (field access) r=michaelmattig a=ChristianBeilschmidt



Co-authored-by: Christian Beilschmidt <[email protected]>

Author: bors[bot]

geoengine/types.py

@@ -181,6 +181,11 @@ class ResultDescriptor:  # pylint: disable=too-few-public-methods
     Base class for result descriptors
     '''
 
+    __spatial_reference: str
+
+    def __init__(self, spatial_reference: str) -> None:
+        self.__spatial_reference = spatial_reference
+
     @staticmethod
     def from_response(response: Dict[str, Any]) -> None:
         '''
@@ -226,20 +231,25 @@ def is_plot_result(cls) -> bool:
 
         return False
 
+    @property
+    def spatial_reference(self) -> str:
+        '''Return the spatial reference'''
+
+        return self.__spatial_reference
+
 
 class VectorResultDescriptor(ResultDescriptor):
     '''
     A vector result descriptor
     '''
 
     __data_type: str
-    __spatial_reference: str
     __columns: Dict[str, str]
 
     def __init__(self, response: Dict[str, Any]) -> None:
         '''Initialize a new `VectorResultDescriptor`'''
+        super().__init__(response['spatialReference'])
         self.__data_type = response['dataType']
-        self.__spatial_reference = response['spatialReference']
         self.__columns = response['columns']
 
     def __repr__(self) -> str:
@@ -269,7 +279,7 @@ def data_type(self) -> str:
     def spatial_reference(self) -> str:
         '''Return the spatial reference'''
 
-        return self.__spatial_reference
+        return super().spatial_reference
 
     @property
     def columns(self) -> Dict[str, str]:
@@ -284,14 +294,13 @@ class RasterResultDescriptor(ResultDescriptor):
     '''
 
     __data_type: str
-    __spatial_reference: str
     __measurement: str
     __no_data_value: str
 
     def __init__(self, response: Dict[str, Any]) -> None:
         '''Initialize a new `RasterResultDescriptor`'''
+        super().__init__(response['spatialReference'])
         self.__data_type = response['dataType']
-        self.__spatial_reference = response['spatialReference']
         self.__measurement = response['measurement']
         self.__no_data_value = response['noDataValue']
 
@@ -313,10 +322,6 @@ def is_raster_result(cls) -> bool:
     def data_type(self) -> str:
         return self.__data_type
 
-    @property
-    def spatial_reference(self) -> str:
-        return self.__spatial_reference
-
     @property
     def measurement(self) -> str:
         return self.__measurement
@@ -325,15 +330,23 @@ def measurement(self) -> str:
     def no_data_value(self) -> str:
         return self.__no_data_value
 
+    @property
+    def spatial_reference(self) -> str:
+        '''Return the spatial reference'''
+
+        return super().spatial_reference
+
 
 class PlotResultDescriptor(ResultDescriptor):
     '''
     A plot result descriptor
     '''
 
-    def __init__(self, _response: Dict[str, Any]) -> None:
+    def __init__(self, response: Dict[str, Any]) -> None:
         '''Initialize a new `PlotResultDescriptor`'''
 
+        super().__init__(response['spatialReference'])
+
     def __repr__(self) -> str:
         '''Display representation of the plot result descriptor'''
         r = 'Plot Result'
@@ -344,6 +357,12 @@ def __repr__(self) -> str:
     def is_plot_result(cls) -> bool:
         return True
 
+    @property
+    def spatial_reference(self) -> str:
+        '''Return the spatial reference'''
+
+        return super().spatial_reference
+
 
 class VectorDataType(Enum):
     '''An enum of vector data types'''

geoengine/workflow.py

@@ -387,7 +387,7 @@ def save_as_dataset(self, bbox: QueryRectangle, name: str, description: str = ''
         if self.get_result_descriptor().spatial_reference != bbox.srs:
             raise SpatialReferenceMismatchException(
                 self.get_result_descriptor().spatial_reference,
-                bbox.spatial_reference
+                bbox.srs
             )
 
         session = get_session()

tests/test_plot.py

@@ -32,7 +32,8 @@ def test_ndvi_histogram(self):
 
             m.get('http://mock-instance/workflow/5b9508a8-bd34-5a1c-acd6-75bb832d2d38/metadata',
                   json={
-                      "type": "plot"
+                      "type": "plot",
+                      "spatialReference": "EPSG:4326",
                   },
                   request_headers={'Authorization': 'Bearer c4983c3e-9b53-47ae-bda9-382223bd5081'})
 
@@ -109,7 +110,8 @@ def test_result_descriptor(self):
 
             m.get('http://mock-instance/workflow/5b9508a8-bd34-5a1c-acd6-75bb832d2d38/metadata',
                   json={
-                      "type": "plot"
+                      "type": "plot",
+                      "spatialReference": "EPSG:4326",
                   },
                   request_headers={'Authorization': 'Bearer c4983c3e-9b53-47ae-bda9-382223bd5081'})
 
@@ -154,7 +156,8 @@ def test_wrong_request(self):
 
             m.get('http://mock-instance/workflow/5b9508a8-bd34-5a1c-acd6-75bb832d2d38/metadata',
                   json={
-                      "type": "plot"
+                      "type": "plot",
+                      "spatialReference": "EPSG:4326",
                   },
                   request_headers={'Authorization': 'Bearer c4983c3e-9b53-47ae-bda9-382223bd5081'})
 
@@ -195,7 +198,8 @@ def test_plot_error(self):
 
             m.get('http://mock-instance/workflow/5b9508a8-bd34-5a1c-acd6-75bb832d2d38/metadata',
                   json={
-                      "type": "plot"
+                      "type": "plot",
+                      "spatialReference": "EPSG:4326",
                   },
                   request_headers={'Authorization': 'Bearer c4983c3e-9b53-47ae-bda9-382223bd5081'})