update dependencies and refactor WFS handler usage in NDVI process and query example

Author: ChristianBeilschmidt

backend/Cargo.lock

@@ -2,13 +2,12 @@
 
 use geoengine_openapi_client::{
     apis::{
-        configuration::Configuration, general_api::server_info_handler,
-        ogcwfs_api::wfs_feature_handler, session_api::anonymous_handler,
-        workflows_api::register_workflow_handler,
+        configuration::Configuration, general_api::server_info_handler, ogcwfs_api::wfs_handler,
+        session_api::anonymous_handler, workflows_api::register_workflow_handler,
     },
     models::{
-        Coordinate2D, GetFeatureRequest, SpatialPartition2D, TypedOperatorOperator, WfsService,
-        Workflow, workflow::Type,
+        Coordinate2D, SpatialPartition2D, TypedOperatorOperator, WfsRequest, WfsService, Workflow,
+        workflow::Type,
     },
 };
 
@@ -47,22 +46,21 @@ async fn main() {
         Coordinate2D::new(5.988_658_074_58, 54.983_104_153),
     );
 
-    let feature_collection = wfs_feature_handler(
+    let feature_collection = wfs_handler(
         &configuration,
         &workflow_id,
-        WfsService::Wfs,
-        GetFeatureRequest::GetFeature,
-        &workflow_id,
-        &bbox_germany.to_string(),
-        None,
+        WfsRequest::GetFeature,
+        Some(&bbox_germany.to_string()),
         None,
-        Some("EPSG:4326"),
         None,
         None,
         None,
         None,
+        Some(WfsService::Wfs),
         None,
+        Some("EPSG:4326"),
         None,
+        Some(&workflow_id),
         None,
     )
     .await

backend/examples/query-geo-engine.rs

@@ -6,10 +6,10 @@ use geoengine_datatypes::{
 };
 use geoengine_openapi_client::{
     apis::{
-        configuration::Configuration, ogcwfs_api::wfs_feature_handler, uploads_api::upload_handler,
+        configuration::Configuration, ogcwfs_api::wfs_handler, uploads_api::upload_handler,
         workflows_api::register_workflow_handler,
     },
-    models::{GeoJson, GetFeatureRequest, SpatialPartition2D, WfsService},
+    models::{GeoJson, SpatialPartition2D, WfsRequest, WfsService},
 };
 use geoengine_operators::{
     engine::{
@@ -392,23 +392,22 @@ async fn compute_ndvi(
         "Requesting NDVI process"
     );
 
-    let feature_collection = wfs_feature_handler(
+    let feature_collection = wfs_handler(
         configuration,
         &workflow_id,
-        WfsService::Wfs,
-        GetFeatureRequest::GetFeature,
-        &workflow_id,
-        &coordinate.to_bbox(0.0).to_string(),
+        WfsRequest::GetFeature,
+        Some(&coordinate.to_bbox(0.0).to_string()),
         None,
-        Some(&time_str),
-        Some("EPSG:4326"),
         None,
         None,
         None,
         None,
+        Some(WfsService::Wfs),
         None,
+        Some("EPSG:4326"),
+        Some(&time_str),
+        Some(&workflow_id),
         None,
-        Some("0.1"), // TODO: adjust to source
     )
     .await?;