Merge branch 'main' of github.com:geo-engine/geoengine into migrate-p…

…ro-api

services/src/api/handlers/wcs.rs

@@ -14,6 +14,7 @@ use actix_web::{web, FromRequest, HttpRequest, HttpResponse};
 use geoengine_datatypes::primitives::{
     AxisAlignedRectangle, BandSelection, RasterQueryRectangle, SpatialPartition2D,
 };
+use geoengine_datatypes::raster::GeoTransform;
 use geoengine_datatypes::{primitives::SpatialResolution, spatial_reference::SpatialReference};
 use geoengine_operators::call_on_generic_raster_processor_gdal_types;
 use geoengine_operators::engine::{ExecutionContext, RasterOperator, WorkflowOperatorPath};
@@ -175,6 +176,7 @@ async fn wcs_capabilities_handler<C: ApplicationContext>(
         ("session_token" = [])
     )
 )]
+#[allow(clippy::too_many_lines)]
 async fn wcs_describe_coverage_handler<C: ApplicationContext>(
     workflow: web::Path<WorkflowId>,
     request: web::Query<DescribeCoverage>,
@@ -218,28 +220,43 @@ async fn wcs_describe_coverage_handler<C: ApplicationContext>(
     let spatial_reference: Option<SpatialReference> = result_descriptor.spatial_reference.into();
     let spatial_reference = spatial_reference.ok_or(error::Error::MissingSpatialReference)?;
 
-    // TODO: give tighter bounds if possible
-    let area_of_use: SpatialPartition2D = spatial_reference.area_of_use_projected()?;
-
-    let (bbox_ll_0, bbox_ll_1, bbox_ur_0, bbox_ur_1) =
-        match spatial_reference_specification(&spatial_reference.proj_string()?)?
-            .axis_order
-            .ok_or(Error::AxisOrderingNotKnownForSrs {
-                srs_string: spatial_reference.srs_string(),
-            })? {
-            AxisOrder::EastNorth => (
-                area_of_use.lower_left().x,
-                area_of_use.lower_left().y,
-                area_of_use.upper_right().x,
-                area_of_use.upper_right().y,
-            ),
-            AxisOrder::NorthEast => (
-                area_of_use.lower_left().y,
-                area_of_use.lower_left().x,
-                area_of_use.upper_right().y,
-                area_of_use.upper_right().x,
-            ),
-        };
+    let resolution = result_descriptor
+        .resolution
+        .unwrap_or(SpatialResolution::zero_point_one());
+
+    let pixel_size_x = resolution.x;
+    let pixel_size_y = -resolution.y;
+
+    let bbox = if let Some(bbox) = result_descriptor.bbox {
+        bbox
+    } else {
+        spatial_reference.area_of_use_projected()?
+    };
+
+    let axis_order = spatial_reference_specification(&spatial_reference.proj_string()?)?
+        .axis_order
+        .ok_or(Error::AxisOrderingNotKnownForSrs {
+            srs_string: spatial_reference.srs_string(),
+        })?;
+    let (bbox_ll_0, bbox_ll_1, bbox_ur_0, bbox_ur_1) = match axis_order {
+        AxisOrder::EastNorth => (
+            bbox.lower_left().x,
+            bbox.lower_left().y,
+            bbox.upper_right().x,
+            bbox.upper_right().y,
+        ),
+        AxisOrder::NorthEast => (
+            bbox.lower_left().y,
+            bbox.lower_left().x,
+            bbox.upper_right().y,
+            bbox.upper_right().x,
+        ),
+    };
+
+    let geo_transform = GeoTransform::new(bbox.upper_left(), pixel_size_x, pixel_size_y);
+
+    let [raster_size_x, raster_size_y] =
+        *(geo_transform.lower_right_pixel_idx(&bbox) + [1, 1]).inner();
 
     let mock = format!(
         r#"<?xml version="1.0" encoding="UTF-8"?>
@@ -258,15 +275,29 @@ async fn wcs_describe_coverage_handler<C: ApplicationContext>(
                         <ows:LowerCorner>{bbox_ll_0} {bbox_ll_1}</ows:LowerCorner>
                         <ows:UpperCorner>{bbox_ur_0} {bbox_ur_1}</ows:UpperCorner>
                     </ows:BoundingBox>
+                    <ows:BoundingBox crs="urn:ogc:def:crs:OGC:1.3:CRS:imageCRS" dimensions="2">
+                        <ows:LowerCorner>0 0</ows:LowerCorner>
+                        <ows:UpperCorner>{raster_size_y} {raster_size_x}</ows:UpperCorner>
+                    </ows:BoundingBox>
                     <wcs:GridCRS>
                         <wcs:GridBaseCRS>urn:ogc:def:crs:{srs_authority}::{srs_code}</wcs:GridBaseCRS>
                         <wcs:GridType>urn:ogc:def:method:WCS:1.1:2dGridIn2dCrs</wcs:GridType>
                         <wcs:GridOrigin>{origin_x} {origin_y}</wcs:GridOrigin>
-                        <wcs:GridOffsets>0 0.0 0.0 -0</wcs:GridOffsets>
+                        <wcs:GridOffsets>{pixel_size_x} 0.0 0.0 {pixel_size_y}</wcs:GridOffsets>
                         <wcs:GridCS>urn:ogc:def:cs:OGC:0.0:Grid2dSquareCS</wcs:GridCS>
                     </wcs:GridCRS>
                 </wcs:SpatialDomain>
             </wcs:Domain>
+            <wcs:Range>
+                <wcs:Field>
+                    <wcs:Identifier>contents</wcs:Identifier>
+                    <wcs:Axis identifier="Bands">
+                        <wcs:AvailableKeys>
+                            <wcs:Key>{band_name}</wcs:Key>
+                        </wcs:AvailableKeys>
+                    </wcs:Axis>
+                </wcs:Field>
+            </wcs:Range>
             <wcs:SupportedCRS>{srs_authority}:{srs_code}</wcs:SupportedCRS>
             <wcs:SupportedFormat>image/tiff</wcs:SupportedFormat>
         </wcs:CoverageDescription>
@@ -275,12 +306,9 @@ async fn wcs_describe_coverage_handler<C: ApplicationContext>(
         workflow_id = identifiers,
         srs_authority = spatial_reference.authority(),
         srs_code = spatial_reference.code(),
-        origin_x = area_of_use.upper_left().x,
-        origin_y = area_of_use.upper_left().y,
-        bbox_ll_0 = bbox_ll_0,
-        bbox_ll_1 = bbox_ll_1,
-        bbox_ur_0 = bbox_ur_0,
-        bbox_ur_1 = bbox_ur_1,
+        origin_x = bbox.upper_left().x,
+        origin_y = bbox.upper_left().y,
+        band_name = result_descriptor.bands[0].name,
     );
 
     Ok(HttpResponse::Ok().content_type(mime::TEXT_XML).body(mock))
@@ -431,8 +459,18 @@ async fn wcs_get_coverage_handler<C: ApplicationContext>(
             }
         };
 
+    // snap bbox to grid
+    let geo_transform = GeoTransform::new(
+        request_partition.upper_left(),
+        spatial_resolution.x,
+        -spatial_resolution.y,
+    );
+    let idx = geo_transform.lower_right_pixel_idx(&request_partition) + [1, 1];
+    let lower_right = geo_transform.grid_idx_to_pixel_upper_left_coordinate_2d(idx);
+    let snapped_partition = SpatialPartition2D::new(request_partition.upper_left(), lower_right)?;
+
     let query_rect = RasterQueryRectangle {
-        spatial_bounds: request_partition,
+        spatial_bounds: snapped_partition,
         time_interval: request.time.unwrap_or_else(default_time_from_config).into(),
         spatial_resolution,
         attributes: BandSelection::first(), // TODO: support multi bands in API and set the selection here
@@ -623,7 +661,7 @@ mod tests {
         xmlns:ogc="http://www.opengis.net/ogc"
         xmlns:ows="http://www.opengis.net/ows/1.1"
         xmlns:gml="http://www.opengis.net/gml"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wcs/1.1.1 http://127.0.0.1:3030/api/wcs/{workflow_id}/schemas/wcs/1.1.1/wcsDescribeCoverage.xsd">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wcs/1.1.1 http://127.0.0.1:3030/api/wcs/1625f9b9-7408-58ab-9482-4d5fb0e3c6e4/schemas/wcs/1.1.1/wcsDescribeCoverage.xsd">
         <wcs:CoverageDescription>
             <ows:Title>Workflow {workflow_id}</ows:Title>
             <wcs:Identifier>{workflow_id}</wcs:Identifier>
@@ -633,15 +671,29 @@ mod tests {
                         <ows:LowerCorner>-90 -180</ows:LowerCorner>
                         <ows:UpperCorner>90 180</ows:UpperCorner>
                     </ows:BoundingBox>
+                    <ows:BoundingBox crs="urn:ogc:def:crs:OGC:1.3:CRS:imageCRS" dimensions="2">
+                        <ows:LowerCorner>0 0</ows:LowerCorner>
+                        <ows:UpperCorner>3600 1800</ows:UpperCorner>
+                    </ows:BoundingBox>
                     <wcs:GridCRS>
                         <wcs:GridBaseCRS>urn:ogc:def:crs:EPSG::4326</wcs:GridBaseCRS>
                         <wcs:GridType>urn:ogc:def:method:WCS:1.1:2dGridIn2dCrs</wcs:GridType>
                         <wcs:GridOrigin>-180 90</wcs:GridOrigin>
-                        <wcs:GridOffsets>0 0.0 0.0 -0</wcs:GridOffsets>
+                        <wcs:GridOffsets>0.1 0.0 0.0 -0.1</wcs:GridOffsets>
                         <wcs:GridCS>urn:ogc:def:cs:OGC:0.0:Grid2dSquareCS</wcs:GridCS>
                     </wcs:GridCRS>
                 </wcs:SpatialDomain>
             </wcs:Domain>
+            <wcs:Range>
+                <wcs:Field>
+                    <wcs:Identifier>contents</wcs:Identifier>
+                    <wcs:Axis identifier="Bands">
+                        <wcs:AvailableKeys>
+                            <wcs:Key>ndvi</wcs:Key>
+                        </wcs:AvailableKeys>
+                    </wcs:Axis>
+                </wcs:Field>
+            </wcs:Range>
             <wcs:SupportedCRS>EPSG:4326</wcs:SupportedCRS>
             <wcs:SupportedFormat>image/tiff</wcs:SupportedFormat>
         </wcs:CoverageDescription>

services/src/api/ogc/wcs/request.rs

@@ -77,16 +77,21 @@ pub struct GetCoverage {
     #[serde(deserialize_with = "parse_wcs_bbox")]
     #[param(value_type = String, example = "-90,-180,90,180,urn:ogc:def:crs:EPSG::4326")]
     pub boundingbox: WcsBoundingbox, // TODO: optional?
-    #[serde(alias = "GRIDBASECRS", alias = "CRS", alias = "crs")]
+    #[serde(
+        alias = "GRIDBASECRS",
+        alias = "GridBaseCRS",
+        alias = "CRS",
+        alias = "crs"
+    )]
     #[serde(deserialize_with = "parse_wcs_crs")]
     #[param(example = "urn:ogc:def:crs:EPSG::4326", value_type = String)]
     pub gridbasecrs: SpatialReference,
     #[serde(default)]
-    #[serde(alias = "GRIDORIGIN")]
+    #[serde(alias = "GRIDORIGIN", alias = "GridOrigin")]
     #[serde(deserialize_with = "parse_grid_origin_option")]
     #[param(value_type = String, example="90,-180")]
     pub gridorigin: Option<GridOrigin>,
-    #[serde(alias = "GRIDOFFSETS")]
+    #[serde(alias = "GRIDOFFSETS", alias = "GridOffsets")]
     #[serde(default)]
     #[serde(deserialize_with = "parse_grid_offset_option")]
     #[param(value_type = String, example="-0.1,0.1")]

test_data/api_calls/wcs.http

@@ -0,0 +1,45 @@
+###
+
+# @name anonymousSession
+POST http://localhost:3030/api/anonymous
+Content-Type: application/json
+
+### 
+
+# @name workflow
+POST http://localhost:3030/api/workflow
+Authorization: Bearer {{anonymousSession.response.body.$.id}}
+Content-Type: application/json
+
+{
+  "type": "Raster",
+  "operator": {
+    "type": "GdalSource",
+    "params": {
+      "data": "ndvi"
+    }
+  }
+}
+
+###
+
+
+# @name workflow
+POST http://localhost:3030/api/workflow
+Authorization: Bearer {{anonymousSession.response.body.$.id}}
+Content-Type: application/json
+
+{
+  "type": "Raster",
+  "operator": {
+    "type": "GdalSource",
+    "params": {
+      "data": "ndvi_3857"
+    }
+  }
+}
+
+###
+
+GET http://localhost:4200/api/wcs/{{workflow.response.body.$.id}}?SERVICE=WCS&REQUEST=DescribeCoverage&VERSION=1.1.1&IDENTIFIERS={{workflow.response.body.$.id}}&FORMAT=text/xml&crs=urn:ogc:def:crs:EPSG::4326
+Authorization: Bearer {{anonymousSession.response.body.$.id}}

test_data/api_calls/wms.http

@@ -0,0 +1,46 @@
+
+###
+
+# @name anonymousSession
+POST http://localhost:3030/api/anonymous
+Content-Type: application/json
+
+### 
+
+# @name workflow
+POST http://localhost:3030/api/workflow
+Authorization: Bearer {{anonymousSession.response.body.$.id}}
+Content-Type: application/json
+
+{
+  "type": "Raster",
+  "operator": {
+    "type": "GdalSource",
+    "params": {
+      "data": "ndvi"
+    }
+  }
+}
+
+### 
+
+# @name workflow
+POST http://localhost:3030/api/workflow
+Authorization: Bearer {{anonymousSession.response.body.$.id}}
+Content-Type: application/json
+
+{
+  "type": "Raster",
+  "operator": {
+    "type": "GdalSource",
+    "params": {
+      "data": "ndvi_3857"
+    }
+  }
+}
+
+###
+
+
+GET http://localhost:4200/api/wms/890d41ec-7e4c-5000-8ab8-7394a758a86f?REQUEST=GetMap&SERVICE=WMS&VERSION=1.3.0&FORMAT=image%2Fpng&STYLES=custom%3A%7B%22type%22%3A%22singleBand%22%2C%22band%22%3A0%2C%22bandColorizer%22%3A%7B%22type%22%3A%22linearGradient%22%2C%22breakpoints%22%3A%5B%7B%22value%22%3A-1%2C%22color%22%3A%5B0%2C0%2C0%2C255%5D%7D%2C%7B%22value%22%3A1%2C%22color%22%3A%5B255%2C255%2C255%2C255%5D%7D%5D%2C%22noDataColor%22%3A%5B0%2C0%2C0%2C0%5D%2C%22overColor%22%3A%5B246%2C250%2C254%2C255%5D%2C%22underColor%22%3A%5B247%2C251%2C255%2C255%5D%7D%7D&TRANSPARENT=true&layers=890d41ec-7e4c-5000-8ab8-7394a758a86f&time=2022-01-01T00%3A00%3A00.000Z&EXCEPTIONS=application%2Fjson&WIDTH=256&HEIGHT=256&CRS=EPSG:32632&BBOX=353060.0%2C5603500.0%2C394020.0%2C5644460.0
+Authorization: Bearer {{anonymousSession.response.body.$.id}}

test_data/dataset_defs/ndvi (3587).json

@@ -22,8 +22,12 @@
         "end": "2014-07-01T00:00:00.000Z"
       },
       "bbox": {
-        "upperLeftCoordinate": [-20026376.39, 20048966.1],
-        "lowerRightCoordinate": [20026376.39, -20048966.1]
+        "upperLeftCoordinate": [
+          -20037508.3427892439067364, 19971868.8804085627198219
+        ],
+        "lowerRightCoordinate": [
+          20027452.8429077081382275, -19966571.3752283006906509
+        ]
       },
       "resolution": {
         "x": 14052.95025804873876,