Codesprint

ogcapi-client/src/client.rs

@@ -237,7 +237,7 @@ impl Pagination<StacEntity> for StacEntities {
 
                     self.links.append(&mut children);
 
-                    return Ok(Some(StacEntity::Catalog(catalog)));
+                    return Ok(Some(StacEntity::Catalog(Box::new(catalog))));
                 }
                 Some("Collection") => {
                     let mut collection = serde_json::from_value::<Collection>(entity.clone())
@@ -271,7 +271,7 @@ impl Pagination<StacEntity> for StacEntities {
 
                     self.links.append(&mut children);
 
-                    return Ok(Some(StacEntity::Item(item)));
+                    return Ok(Some(StacEntity::Item(Box::new(item))));
                 }
                 _ => return Err(Error::ClientError("Unknown STAC entity!".to_string())),
             };

ogcapi-drivers/Cargo.toml

@@ -20,7 +20,7 @@ http = "0.2.7"
 rink-core = { version = "0.6.2", optional = true }
 serde_json = "1.0.81"
 sqlx = { version = "0.5.13", optional = true, features = ["runtime-tokio-rustls", "postgres", "json"] }
-tokio = { version = "1.18.1", features = ["full"] }
+tokio = { version = "1.18.2", features = ["full"] }
 url = { version = "2.2.2", optional = true }
 
 ogcapi-types = { path = "../ogcapi-types" }

ogcapi-drivers/src/postgres/collection.rs

@@ -107,13 +107,14 @@ impl CollectionTransactions for Db {
     async fn list_collections(&self) -> Result<Collections, anyhow::Error> {
         let collections = sqlx::query_scalar!(
             r#"
-            SELECT array_to_json(array_agg(collection)) as "collections!: sqlx::types::Json<Vec<Collection>>" 
+            SELECT array_to_json(array_agg(collection)) as "collections: sqlx::types::Json<Vec<Collection>>" 
             FROM meta.collections
             "#)
             .fetch_one(&self.pool)
             .await?;
 
-        let mut collections = Collections::new(collections.0);
+        let collections = collections.map(|c| c.0).unwrap_or_default();
+        let mut collections = Collections::new(collections);
         collections.number_matched = collections.number_returned;
 
         Ok(collections)

ogcapi-drivers/src/postgres/edr.rs

@@ -88,7 +88,7 @@ impl EdrQuerier for Db {
                     )
                 }
             }
-            QueryType::Corridor => todo!(),
+            QueryType::Corridor | QueryType::Locations => unimplemented!(),
         };
 
         let properties = if let Some(parameters) = &query.parameter_name {
@@ -128,7 +128,7 @@ impl EdrQuerier for Db {
             .await?
             .rows_affected();
 
-        let features: Json<Vec<Feature>> = sqlx::query_scalar(&format!(
+        let features: Option<Json<Vec<Feature>>> = sqlx::query_scalar(&format!(
             r#"
             SELECT array_to_json(array_agg(row_to_json(t)))
             FROM ( {} ) t
@@ -139,7 +139,8 @@ impl EdrQuerier for Db {
         .fetch_one(&self.pool)
         .await?;
 
-        let mut fc = FeatureCollection::new(features.0);
+        let features = features.map(|f| f.0).unwrap_or_default();
+        let mut fc = FeatureCollection::new(features);
         fc.number_matched = Some(number_matched);
 
         Ok(fc)

ogcapi-drivers/src/postgres/feature.rs

@@ -19,19 +19,19 @@ impl FeatureTransactions for Db {
         let id: (String,) = sqlx::query_as(&format!(
             r#"
             INSERT INTO items.{0} (
-                type,
                 properties,
                 geom,
                 links
-            ) VALUES ($1, $2, ST_GeomFromGeoJSON($3), $4)
+            ) VALUES (
+                $1 -> 'properties',
+                ST_GeomFromGeoJSON($1 -> 'geometry'),
+                $1 -> 'links'
+            )
             RETURNING id
             "#,
             &collection
         ))
-        .bind(&feature.r#type)
-        .bind(serde_json::to_value(&feature.properties)?)
-        .bind(serde_json::to_value(&feature.geometry)?)
-        .bind(serde_json::to_value(&feature.links)?)
+        .bind(serde_json::to_value(&feature)?)
         .fetch_one(&self.pool)
         .await?;
 
@@ -74,19 +74,14 @@ impl FeatureTransactions for Db {
             r#"
             UPDATE items.{0}
             SET
-                type = $2,
-                properties = $3,
-                geom = ST_GeomFromGeoJSON($4),
-                links = $5
-            WHERE id = $1
+                properties = $1 -> 'properties',
+                geom = ST_GeomFromGeoJSON($1 -> 'geometry'),
+                links = $1 -> 'links'
+            WHERE id = $1 -> 'id'
             "#,
             &feature.collection.as_ref().unwrap()
         ))
-        .bind(&feature.id)
-        .bind(&feature.r#type)
-        .bind(serde_json::to_value(&feature.properties)?)
-        .bind(serde_json::to_value(&feature.geometry)?)
-        .bind(serde_json::to_value(&feature.links)?)
+        .bind(serde_json::to_value(&feature)?)
         .execute(&self.pool)
         .await?;
 
@@ -160,7 +155,7 @@ impl FeatureTransactions for Db {
             .await?
             .rows_affected();
 
-        let features: sqlx::types::Json<Vec<Feature>> = sqlx::query_scalar(&format!(
+        let features: Option<Json<Vec<Feature>>> = sqlx::query_scalar(&format!(
             r#"
             SELECT array_to_json(array_agg(row_to_json(t)))
             FROM ( {} ) t
@@ -171,7 +166,8 @@ impl FeatureTransactions for Db {
         .fetch_one(&self.pool)
         .await?;
 
-        let mut fc = FeatureCollection::new(features.0);
+        let features = features.map(|f| f.0).unwrap_or_default();
+        let mut fc = FeatureCollection::new(features);
         fc.number_matched = Some(number_matched);
 
         Ok(fc)

ogcapi-drivers/src/postgres/style.rs

@@ -13,7 +13,7 @@ impl StyleTransactions for Db {
     async fn list_styles(&self) -> Result<Styles, anyhow::Error> {
         let styles = sqlx::query_scalar!(
             r#"
-            SELECT array_to_json(array_agg(row_to_json(t))) as "styles!: Json<Vec<Style>>"
+            SELECT array_to_json(array_agg(row_to_json(t))) as "styles: Json<Vec<Style>>"
             FROM (
                 SELECT id, title, links FROM meta.styles
             ) t
@@ -22,7 +22,8 @@ impl StyleTransactions for Db {
         .fetch_one(&self.pool)
         .await?;
 
-        Ok(Styles { styles: styles.0 })
+        let styles = styles.map(|s| s.0).unwrap_or_default();
+        Ok(Styles { styles })
     }
 
     async fn read_style(&self, id: &str) -> Result<Value, anyhow::Error> {

ogcapi-drivers/src/postgres/tile.rs

@@ -23,12 +23,11 @@ impl TileTransactions for Db {
 
             sql.push(format!(
                 r#"
-                SELECT ST_AsMVT(mvtgeom, '{0}', 4096, 'geom', 'id')
+                SELECT ST_AsMVT(mvtgeom, '{0}', 4096, 'geom')
                 FROM (
                     SELECT
                         ST_AsMVTGeom(ST_Transform(ST_Force2D(geom), 3857), ST_TileEnvelope($1, $3, $2), 4096, 64, TRUE) AS geom,
                         '{0}' as collection,
-                        id,
                         properties
                     FROM items.{0}
                     WHERE geom && ST_Transform(ST_TileEnvelope($1, $3, $2, margin => (64.0 / 4096)), {1})

ogcapi-services/Cargo.toml

@@ -16,7 +16,7 @@ stac = ["ogcapi-types/stac", "ogcapi-drivers/stac"]
 
 [dependencies]
 anyhow = "1.0.57"
-axum = { version = "0.5.4", features = ["headers"] }
+axum = { version = "0.5.5", features = ["headers"] }
 clap = { version = "3.1.17", features = ["derive", "env"] }
 dotenv = "0.15.0"
 hyper = { version = "0.14.18", features = ["full"] }
@@ -27,9 +27,9 @@ serde_json = "1.0.81"
 serde_yaml = "0.8.24"
 serde_qs = "0.9.2"
 thiserror = "1.0.31"
-tokio = { version = "1.18.1", features = ["full"] }
+tokio = { version = "1.18.2", features = ["full"] }
 tower = "0.4.12"
-tower-http = { version = "0.3.2", features = ["cors", "trace"] }
+tower-http = { version = "0.3.3", features = ["cors", "trace"] }
 tracing = "0.1.34"
 tracing-subscriber = { version="0.3.11", features = ["env-filter"] }
 url = { version = "2.2.2", features = ["serde"] }