feat(core, validate): update to STAC v1.1.0

Author: gadomski

cli/examples

@@ -1 +1 @@
-../spec-examples/v1.0.0
+../spec-examples/v1.1.0

cli/tests/smoke.rs

@@ -31,9 +31,9 @@ fn migrate() {
     let mut command = Command::cargo_bin("stacrs").unwrap();
     command
         .arg("migrate")
-        .arg("examples/simple-item.json")
+        .arg("../spec-examples/v1.0.0/simple-item.json")
         .arg("--version")
-        .arg("1.1.0-beta.1")
+        .arg("1.1.0")
         .assert()
         .success();
 }

core/CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 
 - Update **geoarrow** to v0.3.0 ([#367](https://github.com/stac-utils/stac-rs/pull/367))
+- Default STAC version is now v1.1.0 ([#399](https://github.com/stac-utils/stac-rs/pull/399))
 
 ### Removed
 

core/data/bands-v1.1.0-beta.1.json renamed to core/data/bands-v1.1.0.json

@@ -1,6 +1,6 @@
 {
     "type": "Feature",
-    "stac_version": "1.1.0-beta.1",
+    "stac_version": "1.1.0",
     "id": "bands-migration",
     "geometry": null,
     "properties": {

core/examples

@@ -1 +1 @@
-../spec-examples/v1.0.0
+../spec-examples/v1.1.0

core/src/extensions/mod.rs

@@ -32,7 +32,7 @@
 //!
 //! // Get extension information
 //! let mut projection: Projection = item.extension().unwrap().unwrap();
-//! println!("epsg: {}", projection.epsg.unwrap());
+//! println!("code: {}", projection.code.as_ref().unwrap());
 //!
 //! // Set extension information
 //! projection.centroid = Some(Centroid { lat: 34.595302, lon: -101.344483 });
@@ -112,7 +112,7 @@ pub trait Extensions: Fields {
     /// use stac::{Item, extensions::{Projection, Extensions}};
     /// let mut item = Item::new("an-id");
     /// assert!(!item.has_extension::<Projection>());
-    /// let projection = Projection { epsg: Some(4326), ..Default::default() };
+    /// let projection = Projection { code: Some("EPSG:4326".to_string()), ..Default::default() };
     /// item.set_extension(projection).unwrap();
     /// assert!(item.has_extension::<Projection>());
     /// ```
@@ -132,7 +132,7 @@ pub trait Extensions: Fields {
     /// use stac::{Item, extensions::{Projection, Extensions}};
     /// let item: Item = stac::read("examples/extensions-collection/proj-example/proj-example.json").unwrap();
     /// let projection: Projection = item.extension().unwrap().unwrap();
-    /// assert_eq!(projection.epsg.unwrap(), 32614);
+    /// assert_eq!(projection.code.unwrap(), "EPSG:32614");
     /// ```
     fn extension<E: Extension>(&self) -> Result<Option<E>> {
         if self.has_extension::<E>() {
@@ -165,7 +165,7 @@ pub trait Extensions: Fields {
     /// ```
     /// use stac::{Item, extensions::{Projection, Extensions}};
     /// let mut item = Item::new("an-id");
-    /// let projection = Projection { epsg: Some(4326), ..Default::default() };
+    /// let projection = Projection { code: Some("EPSG:4326".to_string()), ..Default::default() };
     /// item.set_extension(projection).unwrap();
     /// ```
     fn set_extension<E: Extension>(&mut self, extension: E) -> Result<()> {
@@ -229,31 +229,17 @@ mod tests {
         assert!(asset.has_extension::<Raster>());
         let mut item = Item::new("an-id");
         let _ = item.assets.insert("data".to_string(), asset);
-
-        // TODO how do we let items know about what their assets are doing?
-        // Maybe we don't?
-        // assert!(item.has_extension::<Raster>());
-        // let item = serde_json::to_value(item).unwrap();
-        // assert_eq!(
-        //     item.as_object()
-        //         .unwrap()
-        //         .get("stac_extensions")
-        //         .unwrap()
-        //         .as_array()
-        //         .unwrap(),
-        //     &vec!["https://stac-extensions.github.io/raster/v1.1.0/schema.json"]
-        // );
     }
 
     #[test]
     fn remove_extension() {
         let mut item = Item::new("an-id");
         item.extensions
-            .push("https://stac-extensions.github.io/projection/v1.1.0/schema.json".to_string());
+            .push("https://stac-extensions.github.io/projection/v2.0.0/schema.json".to_string());
         let _ = item
             .properties
             .additional_fields
-            .insert("proj:epsg".to_string(), json!(4326));
+            .insert("proj:code".to_string(), json!("EPSG:4326"));
         assert!(item.has_extension::<Projection>());
         item.remove_extension::<Projection>();
         assert!(!item.has_extension::<Projection>());

core/src/extensions/projection.rs

@@ -10,7 +10,7 @@ use serde_json::{Map, Value};
 pub struct Projection {
     /// EPSG code of the datasource
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub epsg: Option<i32>,
+    pub code: Option<String>,
 
     /// WKT2 string representing the Coordinate Reference System (CRS) that the
     /// proj:geometry and proj:bbox fields represent
@@ -56,14 +56,14 @@ pub struct Centroid {
 impl Projection {
     /// Returns this projection's bounds in WGS84.
     ///
-    /// Requires one of the crs fields to be set (epsg, wkt2, or projjson) as well as a bbox.
+    /// Requires one of the crs fields to be set (code, wkt2, or projjson) as well as a bbox.
     ///
     /// # Examples
     ///
     /// ```
     /// use stac::extensions::Projection;
     /// let projection = Projection {
-    ///     epsg: Some(32621),
+    ///     code: Some("EPSG:32621".to_string()),
     ///     bbox: Some(vec![
     ///         373185.0,
     ///         8019284.949381611,
@@ -109,8 +109,8 @@ impl Projection {
         use crate::Error;
         use gdal::spatial_ref::SpatialRef;
 
-        if let Some(epsg) = self.epsg {
-            SpatialRef::from_epsg(epsg.try_into()?)
+        if let Some(code) = self.code.as_deref() {
+            SpatialRef::from_definition(code)
                 .map(Some)
                 .map_err(Error::from)
         } else if let Some(wkt) = self.wkt2.as_ref() {
@@ -127,19 +127,20 @@ impl Projection {
 
 impl Extension for Projection {
     const IDENTIFIER: &'static str =
-        "https://stac-extensions.github.io/projection/v1.1.0/schema.json";
+        "https://stac-extensions.github.io/projection/v2.0.0/schema.json";
     const PREFIX: &'static str = "proj";
 }
 
 #[cfg(test)]
 mod tests {
+    use super::Projection;
+    use crate::{Extensions, Item};
+
     #[cfg(feature = "gdal")]
     #[test]
     fn axis_order() {
-        use super::Projection;
-
         let projection = Projection {
-            epsg: Some(32621),
+            code: Some("EPSG:32621".to_string()),
             bbox: Some(vec![
                 373185.0,
                 8019284.949381611,
@@ -156,4 +157,12 @@ mod tests {
         );
         assert!((bounds.ymin() - 72.229798).abs() < 0.1);
     }
+
+    #[test]
+    fn example() {
+        let item: Item =
+            crate::read("examples/extensions-collection/proj-example/proj-example.json").unwrap();
+        let projection = item.extension::<Projection>().unwrap().unwrap();
+        assert_eq!(projection.code.unwrap(), "EPSG:32614");
+    }
 }

core/src/fields.rs

@@ -100,7 +100,7 @@ pub trait Fields {
     ///
     /// ```
     /// use stac::{Fields, Item, extensions::Projection};
-    /// let projection = Projection { epsg: Some(4326), ..Default::default() };
+    /// let projection = Projection { code: Some("EPSG:4326".to_string()), ..Default::default() };
     /// let mut item = Item::new("an-id");
     /// item.set_fields_with_prefix("proj", projection);  // Prefer `Extensions::set_extension`
     /// ```
@@ -122,7 +122,7 @@ pub trait Fields {
     ///
     /// ```
     /// use stac::{Fields, Item, extensions::Projection};
-    /// let projection = Projection { epsg: Some(4326), ..Default::default() };
+    /// let projection = Projection { code: Some("EPSG:4326".to_string()), ..Default::default() };
     /// let mut item = Item::new("an-id");
     /// item.remove_fields_with_prefix("proj");  // Prefer `Extensions::remove_extension`
     /// ```

core/src/gdal.rs

@@ -123,10 +123,13 @@ fn update_asset(
             .map(|auth_name| auth_name == "EPSG")
             .unwrap_or_default()
         {
-            projection.epsg = spatial_ref.auth_code().ok();
+            projection.code = spatial_ref
+                .auth_code()
+                .map(|code| format!("EPSG:{}", code))
+                .ok();
         }
         // FIXME Don't know how to get WKT2 out of the gdal crate yet.
-        if projection.epsg.is_none() {
+        if projection.code.is_none() {
             projection.projjson = spatial_ref
                 .to_projjson()
                 .ok()
@@ -223,7 +226,7 @@ mod tests {
             .unwrap();
         super::update_item(&mut item, false, true).unwrap();
         let projection: Projection = item.extension().unwrap().unwrap();
-        assert_eq!(projection.epsg.unwrap(), 32621);
+        assert_eq!(projection.code.unwrap(), "EPSG:32621");
         assert_eq!(
             projection.bbox.unwrap(),
             vec![373185.0, 8019284.949381611, 639014.9492102272, 8286015.0]

core/src/lib.rs

@@ -56,7 +56,7 @@
 //! use stac::{Value, Migrate, Version};
 //!
 //! let value: Value = stac::read("examples/simple-item.json").unwrap();
-//! let value = value.migrate(&Version::v1_1_0_beta_1).unwrap();
+//! let value = value.migrate(&Version::v1_1_0).unwrap();
 //! ```
 //!
 //! # Input and output
@@ -204,7 +204,7 @@ pub use {
 };
 
 /// The default STAC version of this library.
-pub const STAC_VERSION: Version = Version::v1_0_0;
+pub const STAC_VERSION: Version = Version::v1_1_0;
 
 /// Custom [Result](std::result::Result) type for this crate.
 pub type Result<T> = std::result::Result<T, Error>;
@@ -385,7 +385,7 @@ mod tests {
         ($function:ident, $filename:expr, $object:ident) => {
             #[test]
             fn $function() {
-                use assert_json_diff::assert_json_eq;
+                use assert_json_diff::{assert_json_matches, CompareMode, Config, NumericMode};
                 use chrono::{DateTime, Utc};
                 use serde_json::Value;
                 use std::{fs::File, io::BufReader};
@@ -439,7 +439,11 @@ mod tests {
                 }
                 let object: $object = serde_json::from_value(before.clone()).unwrap();
                 let after = serde_json::to_value(object).unwrap();
-                assert_json_eq!(before, after);
+                assert_json_matches!(
+                    before,
+                    after,
+                    Config::new(CompareMode::Strict).numeric_mode(NumericMode::AssumeFloat)
+                );
             }
         };
     }