feat: WildLIVE connector outputs more layers with more detailed information

Author: ChristianBeilschmidt

operators/src/processing/expression/vector_operator.rs

@@ -98,6 +98,12 @@ pub enum OutputColumn {
     Column(String),
 }
 
+impl From<GeoVectorDataType> for OutputColumn {
+    fn from(value: GeoVectorDataType) -> Self {
+        OutputColumn::Geometry(value)
+    }
+}
+
 struct InitializedVectorExpression {
     name: CanonicOperatorName,
     path: WorkflowOperatorPath,

services/src/datasets/external/wildlive/cache.rs

@@ -21,7 +21,7 @@ pub trait DatasetInDb {
 impl DatasetInDb for WildliveLayerId {
     fn table_name(&self) -> &str {
         match self {
-            WildliveLayerId::Projects => "wildlive_projects",
+            WildliveLayerId::Projects | WildliveLayerId::ProjectBounds => "wildlive_projects",
             WildliveLayerId::Stations { project_id: _ } => "wildlive_stations",
             WildliveLayerId::Captures { project_id: _ } => "wildlive_captures",
         }
@@ -57,6 +57,12 @@ pub trait WildliveDbCache: Send + Sync {
         project_id: &str,
         captures: &[CaptureFeature],
     ) -> Result<()>;
+
+    async fn project_name_by_id(
+        &self,
+        provider_id: DataProviderId,
+        project_id: &str,
+    ) -> Result<Option<String>>;
 }
 
 #[async_trait]
@@ -172,6 +178,32 @@ where
             .await
             .boxed_context(error::UnexpectedExecution)
     }
+
+    async fn project_name_by_id(
+        &self,
+        provider_id: DataProviderId,
+        project_id: &str,
+    ) -> Result<Option<String>> {
+        let connection = get_connection!(self.conn_pool);
+
+        let row = connection
+            .query_opt(
+                "
+                SELECT name
+                FROM wildlive_projects
+                WHERE
+                    provider_id = $1 AND
+                    project_id = $2
+                ORDER BY cache_date DESC
+                LIMIT 1
+                ",
+                &[&provider_id, &project_id],
+            )
+            .await
+            .boxed_context(error::UnexpectedExecution)?;
+
+        Ok(row.map(|r| r.get::<_, String>(0)))
+    }
 }
 
 /// Gets a connection from the pool
@@ -290,7 +322,7 @@ where
             "
                 SELECT EXISTS (
                     SELECT 1
-                    FROM wildlive_stations
+                    FROM wildlive_projects
                     WHERE
                         provider_id = $1 AND
                         cache_date = $2

services/src/datasets/external/wildlive/datasets.rs

@@ -191,9 +191,13 @@ pub(super) async fn projects_dataset(
                     .filter_map(|layout| station_coordinates.get(layout))
                     .flat_map(|coordinates| coordinates.iter().map(Coordinate2D::from)),
             ) else {
-                return Err(WildliveError::EmptyProjectBounds {
-                    project: project.id,
-                });
+                error!(
+                    "{:?}",
+                    WildliveError::EmptyProjectBounds {
+                        project: project.id,
+                    }
+                );
+                continue;
             };
 
             features.push(ProjectFeature {
@@ -204,10 +208,10 @@ pub(super) async fn projects_dataset(
             });
         }
 
-        Ok(features)
+        features
     })
     .await
-    .boxed_context(error::UnexpectedExecution)??;
+    .boxed_context(error::UnexpectedExecution)?;
 
     Ok(features)
 }
@@ -238,7 +242,7 @@ pub(super) async fn projects(
         .collect())
 }
 
-async fn project(
+pub(super) async fn project(
     api_endpoint: &Url,
     api_token: Option<&AccessToken>,
     project_id: &str,

services/src/datasets/external/wildlive/error.rs

@@ -24,7 +24,7 @@ pub enum WildliveError {
     InvalidProjectBounds {
         source: geoengine_datatypes::error::Error,
     },
-    #[snafu(display("Unable to get bounds for project: {project}"))]
+    #[snafu(display("Empty project bounds for project: {project}"))]
     EmptyProjectBounds {
         project: String,
     },