Merge branch 'main' into issues/195-python

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
           tar czvf $ARCHIVE_FILE -C target/release stac
           shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: binaries
           path: |
@@ -38,11 +38,11 @@ jobs:
       - x84_64-apple-darwin
     if: "startsWith(github.ref, 'refs/tags/stac-cli')"
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: binaries
           path: binaries
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: binaries/*

RELEASING.md

@@ -8,9 +8,10 @@
 4. Update the package's `Cargo.toml` file accordingly, and update the other packages' `Cargo.toml` if they depend on this package.
 5. Scan the package's README for references to version numbers, and update any that are needed.
 6. Update the package's CHANGELOG with a new section for the new version. Don't forget to update the links at the bottom, too.
-7. Test the release with `cargo release -p {package name}`. By default, this does a dry-run, so it won't actually do anything.
-8. Use the normal pull request workflow to merge your branch.
-9. Once merged, run `cargo release --execute` to do the release. Use the same `-p` flags as you did during the dry run.
+7. If it's a breaking release, search for any deprecated functions that should be removed.
+8. Test the release with `cargo release -p {package name}`. By default, this does a dry-run, so it won't actually do anything.
+9. Use the normal pull request workflow to merge your branch.
+10. Once merged, run `cargo release --execute` to do the release. Use the same `-p` flags as you did during the dry run.
 
 ## After-the-fact releases
 

stac-api/CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [0.3.3] - 2024-04-07
+
+### Added
+
+- `Search::validate` ([#206](https://github.com/stac-utils/stac-rs/pull/206))
+- `geo` feature, `Search::matches` and sub-methods, `Search::new`, `Search::ids`, `Default` for `Filter`, `Error::Stac`, and `Error::Unimplemented` ([#209](https://github.com/stac-utils/stac-rs/pull/209))
+
 ## [0.3.2] - 2023-10-11
 
 ### Added
@@ -71,7 +78,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 Initial release
 
-[unreleased]: https://github.com/stac-utils/stac-rs/compare/stac-api-v0.3.2...main
+[unreleased]: https://github.com/stac-utils/stac-rs/compare/stac-api-v0.3.3...main
+[0.3.3]: https://github.com/stac-utils/stac-rs/compare/stac-api-v0.3.2...stac-api-v0.3.3
 [0.3.2]: https://github.com/stac-utils/stac-rs/compare/stac-api-v0.3.1...stac-api-v0.3.2
 [0.3.1]: https://github.com/stac-utils/stac-rs/compare/stac-api-v0.3.0...stac-api-v0.3.1
 [0.3.0]: https://github.com/stac-utils/stac-rs/compare/stac-api-v0.2.0...stac-api-v0.3.0

stac-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stac-api"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Pete Gadomski <[email protected]>"]
 edition = "2021"
 description = "Rust library for the SpatioTemporal Asset Catalog (STAC) API specification"
@@ -11,13 +11,18 @@ keywords = ["geospatial", "stac", "metadata", "geo", "raster"]
 categories = ["science", "data-structures", "web-programming"]
 
 [features]
+geo = ["dep:geo", "stac/geo"]
 schemars = ["dep:schemars", "stac/schemars"]
 
 [dependencies]
+geo = { version = "0.28", optional = true }
 schemars = { version = "0.8", optional = true }
 serde = "1"
 serde_json = "1"
 serde_urlencoded = "0.7"
 stac = { version = "0.5", path = "../stac" }
 thiserror = "1"
 url = "2.3"
+
+[dev-dependencies]
+geojson = "0.24"

stac-api/README.md

@@ -19,7 +19,15 @@ To use the library in your project:
 stac-api = "0.3"
 ```
 
-**stac-api** has one optional feature, `schemars`, which can be used to generate [jsonschema](https://json-schema.org/) documents for the API structures.
+**stac-api** has two optional features.
+`geo` enables `Search::match`:
+
+```toml
+[dependencies]
+stac-api = { version = "0.3", features = ["geo"] }
+```
+
+`schemars`, can be used to generate [jsonschema](https://json-schema.org/) documents for the API structures.
 This is useful for auto-generating OpenAPI documentation:
 
 ```toml

stac-api/src/error.rs

@@ -1,3 +1,4 @@
+use crate::Search;
 use serde_json::{Map, Value};
 use thiserror::Error;
 
@@ -23,6 +24,10 @@ pub enum Error {
     #[error(transparent)]
     ParseFloatError(#[from] std::num::ParseFloatError),
 
+    /// A search has both bbox and intersects.
+    #[error("search has bbox and intersects")]
+    SearchHasBboxAndIntersects(Search),
+
     /// [serde_json::Error]
     #[error(transparent)]
     SerdeJson(#[from] serde_json::Error),
@@ -31,11 +36,19 @@ pub enum Error {
     #[error(transparent)]
     SerdeUrlencodedSer(#[from] serde_urlencoded::ser::Error),
 
+    /// [stac::Error]
+    #[error(transparent)]
+    Stac(#[from] stac::Error),
+
     /// [std::num::TryFromIntError]
     #[error(transparent)]
     TryFromInt(#[from] std::num::TryFromIntError),
 
     /// [url::ParseError]
     #[error(transparent)]
     UrlParse(#[from] url::ParseError),
+
+    /// This functionality is not yet implemented.
+    #[error("this functionality is not yet implemented: {0}")]
+    Unimplemented(&'static str),
 }

stac-api/src/filter.rs

@@ -15,6 +15,12 @@ pub enum Filter {
     Cql2Json(Map<String, Value>),
 }
 
+impl Default for Filter {
+    fn default() -> Self {
+        Filter::Cql2Json(Default::default())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::Filter;

stac-api/src/lib.rs

@@ -104,6 +104,9 @@ pub type Result<T> = std::result::Result<T, Error>;
 /// servers to explicitly include or exclude certain fields.
 pub type Item = serde_json::Map<String, serde_json::Value>;
 
+#[cfg(test)]
+use geojson as _;
+
 // From https://github.com/rust-lang/cargo/issues/383#issuecomment-720873790,
 // may they be forever blessed.
 #[cfg(doctest)]