#334 take resolution into account when applying buffer

Author: jdries

openeo_driver/ProcessGraphDeserializer.py

@@ -517,6 +517,18 @@ def _collection_crs(collection_id, env) -> str:
     crs = metadata.get('cube:dimensions', {}).get('x', {}).get('reference_system', None)
     return crs
 
+def _collection_resolution(collection_id, env) -> str:
+    try:
+        metadata = env.backend_implementation.catalog.get_collection_metadata(collection_id)
+    except CollectionNotFoundException:
+        return None
+    x = metadata.get('cube:dimensions', {}).get('x', {})
+    y = metadata.get('cube:dimensions', {}).get('y', {})
+    if ( "step" in x and "step" in y):
+        return [x['step'], y['step']]
+    else:
+        return None
+
 
 def _align_extent(extent,collection_id,env,target_resolution=None):
     metadata = None
@@ -529,13 +541,14 @@ def _align_extent(extent,collection_id,env,target_resolution=None):
     if metadata is None or not metadata.get("_vito",{}).get("data_source", {}).get("realign", True):
         return extent
 
-    crs = metadata.get('cube:dimensions', {}).get('x', {}).get('reference_system', None)
+    crs = _collection_crs(collection_id, env)
+    collection_resolution = _collection_resolution(collection_id, env)
     isUTM = crs == "AUTO:42001" or "Auto42001" in str(crs)
 
     x = metadata.get('cube:dimensions', {}).get('x', {})
     y = metadata.get('cube:dimensions', {}).get('y', {})
-    if (target_resolution == None and "step" in x and "step" in y ):
-        target_resolution = [x['step'], y['step']]
+    if (target_resolution == None and collection_resolution != None ):
+        target_resolution = collection_resolution
     elif target_resolution == None:
         return extent
 
@@ -606,20 +619,21 @@ def _extract_load_parameters(env: EvalEnv, source_id: tuple) -> LoadParameters:
             if extent is not None:
                 collection_crs = _collection_crs(collection_id[1][0], env)
                 crs = constraint.get("resample", {}).get("target_crs", collection_crs) or collection_crs
+                target_resolution = constraint.get("resample", {}).get("resolution", None) or _collection_resolution(collection_id[1][0], env)
 
                 if "pixel_buffer" in constraint:
 
                     buffer = constraint["pixel_buffer"]["buffer_size"]
 
-                    if crs is not None:
+                    if (crs is not None) and target_resolution:
                         bbox = BoundingBox.from_dict(extent, default_crs=4326)
                         extent = bbox.reproject(crs).as_dict()
 
                         extent = {
-                            "west": extent["west"] - buffer[0],
-                            "east": extent["east"] + buffer[0],
-                            "south": extent["south"] - buffer[1],
-                            "north": extent["north"] + buffer[1],
+                            "west": extent["west"] - target_resolution[0] * buffer[0],
+                            "east": extent["east"] + target_resolution[0] * buffer[0],
+                            "south": extent["south"] - target_resolution[1] * buffer[1],
+                            "north": extent["north"] + target_resolution[1] * buffer[1],
                             "crs": extent["crs"]
                         }
                     else:
@@ -636,7 +650,7 @@ def _extract_load_parameters(env: EvalEnv, source_id: tuple) -> LoadParameters:
 
                 if  no_resampling:
                     # Ensure that the extent that the user provided is aligned with the collection's native grid.
-                    target_resolution = constraint.get("resample",{}).get("resolution",None)
+
                     extent = _align_extent(extent, collection_id[1][0], env,target_resolution)
 
                 global_extent = spatial_extent_union(global_extent, extent) if global_extent else extent

tests/test_dry_run.py

@@ -2133,10 +2133,10 @@ def test_complex_diamond_and_buffering(dry_run_env,dry_run_tracer):
 
     print(loadparams)
     expected_extent = {'crs': 'EPSG:32631',
-                       'east': 704520,
-                       'north': 5194000,
-                       'south': 5164900,
-                       'west': 692080}
+                     'east': 704870,
+                     'north': 5194350,
+                     'south': 5164550,
+                     'west': 691730}
     assert(loadparams.global_extent == expected_extent)
     assert loadparams.bands == ['B01', 'B02', 'B03', 'B04', 'B05', 'B06', 'B07', 'B08', 'B8A', 'B09', 'B11', 'B12', 'SCL']
     assert loadparams.pixel_buffer == None
@@ -2166,10 +2166,10 @@ def test_complex_extract_load_stac(dry_run_env,dry_run_tracer):
 
     print(loadparams)
     expected_extent = {'crs': 'EPSG:32633',
-                         'east': 400110,
-                         'north': 4700160,
-                         'south': 4679930,
-                         'west': 380190}
+                     'east': 400450,
+                     'north': 4700510,
+                     'south': 4679580,
+                     'west': 379840}
     assert(loadparams.global_extent == expected_extent)
     assert loadparams.bands == [ 'B02', 'B03', 'B04', 'B05', 'B06', 'B07', 'B08', 'B8A', 'B11', 'B12']
     assert loadparams.pixel_buffer == None