Allow integer for feature id

Author: b4l

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Make features opt-out rather than opt-in for released standards
+- Allow integers for feature id.
 
 ### Added
 

ogcapi-client/src/client.rs

@@ -489,7 +489,7 @@ mod tests {
             .with_collections(["ch.swisstopo.swissalti3d"]);
         let mut items = client.search(params).unwrap();
         let item = items.next().unwrap().unwrap();
-        assert_eq!(Some("swissalti3d_2019_2600-1199".to_string()), item.id);
+        assert_eq!("swissalti3d_2019_2600-1199", item.id.unwrap().to_string());
         assert_eq!(
             Some("ch.swisstopo.swissalti3d".to_string()),
             item.collection

ogcapi-services/src/routes/features.rs

@@ -15,7 +15,7 @@ use ogcapi_types::{
         link_rel::{COLLECTION, NEXT, PREV, ROOT, SELF},
         media_type::{GEO_JSON, JSON},
     },
-    features::{Feature, FeatureCollection, Query},
+    features::{Feature, FeatureId, FeatureCollection, Query},
 };
 
 use crate::{
@@ -95,7 +95,11 @@ async fn update(
     Path((collection_id, id)): Path<(String, String)>,
     Json(mut feature): Json<Feature>,
 ) -> Result<StatusCode> {
-    feature.id = Some(id);
+    match feature.id {
+        Some(ref fid) => assert_eq!(id, fid.to_string()),
+        None => feature.id = Some(FeatureId::String(id)),
+    }
+
     feature.collection = Some(collection_id);
 
     state.drivers.features.update_feature(&feature).await?;

ogcapi-types/src/features/feature.rs

@@ -1,5 +1,6 @@
 #[cfg(feature = "stac")]
 use std::collections::HashMap;
+use std::fmt::Display;
 
 #[cfg(feature = "stac")]
 use crate::common::Bbox;
@@ -15,11 +16,28 @@ pub enum Type {
     Feature,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(untagged)]
+pub enum FeatureId {
+    String(String),
+    Integer(isize),
+}
+
+impl Display for FeatureId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            FeatureId::String(s) => f.write_str(s),
+            FeatureId::Integer(i) => f.write_fmt(format_args!("{i}")),
+        }
+    }
+}
+
 /// Abstraction of real world phenomena (ISO 19101-1:2014)
 #[serde_with::skip_serializing_none]
 #[derive(Deserialize, Serialize, Debug, Clone, PartialEq)]
 pub struct Feature {
-    pub id: Option<String>,
+    #[serde(default)]
+    pub id: Option<FeatureId>,
     pub collection: Option<String>,
     #[serde(default)]
     pub r#type: Type,
@@ -42,6 +60,7 @@ pub struct Feature {
     pub assets: HashMap<String, crate::stac::Asset>,
     /// Bounding Box of the asset represented by this Item, formatted according to RFC 7946, section 5.
     #[cfg(feature = "stac")]
+    #[serde(default)]
     pub bbox: Option<Bbox>,
 }
 

ogcapi-types/src/features/mod.rs

@@ -2,7 +2,7 @@ mod feature;
 mod feature_collection;
 mod query;
 
-pub use feature::Feature;
+pub use feature::{Feature, FeatureId};
 pub use feature_collection::FeatureCollection;
 pub use query::Query;