Revert "feat: add a basic tree structure (#504)"

This reverts commit 8d70a20.
stac-utils · Oct 31, 2024 · 8f1a6a7 · 8f1a6a7
1 parent 8d70a20
commit 8f1a6a7
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 312 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
       - name: Test
-        run: cargo test -p stac stac-types --all-features
+        run: cargo test -p stac --all-features
   check-features-core:
     name: Check stac features
     runs-on: ubuntu-latest

diff --git a/Cargo.toml b/Cargo.toml
@@ -62,7 +62,6 @@ object_store = "0.11.0"
 openssl = { version = "0.10.68", features = ["vendored"] }
 openssl-src = "=300.3.1"                                      # joinked from https://github.com/iopsystems/rpc-perf/commit/705b290d2105af6f33150da04b217422c6d68701#diff-2e9d962a08321605940b5a657135052fbcef87b5e360662bb527c96d9a615542R41 to cross-compile Python
 parquet = { version = "52.2", default-features = false }
-path-slash = "0.2.1"
 pgstac = { version = "0.2.1", path = "crates/pgstac" }
 pyo3 = "0.22.3"
 pythonize = "0.22.0"

diff --git a/crates/cli/src/subcommand/serve.rs b/crates/cli/src/subcommand/serve.rs
@@ -93,7 +93,7 @@ impl Run for Args {
                 }
                 Value::Collection(mut collection) => {
                     if self.load_collection_items {
-                        collection.make_links_absolute()?;
+                        collection.make_relative_links_absolute()?;
                         for link in collection.iter_item_links() {
                             let href = link.href.to_string();
                             let input = input.with_href(href);

diff --git a/crates/core/CHANGELOG.md b/crates/core/CHANGELOG.md
@@ -9,11 +9,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Added
 
 - `version` ([#476](https://github.com/stac-utils/stac-rs/pull/476))
-- `Node` and friends ([#504](https://github.com/stac-utils/stac-rs/pull/504))
-
-### Changed
-
-- `make_links_absolute` instead of `make_relative_links_absolute`, `make_links_relative` instead of `make_absolute_links_relative` ([#504](https://github.com/stac-utils/stac-rs/pull/504))
 - Permissive deserialization ([#505](https://github.com/stac-utils/stac-rs/pull/505))
 
 ### Removed

diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -63,7 +63,6 @@ jsonschema = { workspace = true, optional = true }
 log.workspace = true
 object_store = { workspace = true, optional = true }
 parquet = { workspace = true, optional = true }
-path-slash.workspace = true
 reqwest = { workspace = true, features = ["json", "blocking"], optional = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["preserve_order"] }

diff --git a/crates/core/src/item.rs b/crates/core/src/item.rs
@@ -3,11 +3,10 @@
 use crate::{Asset, Assets, Bbox, Error, Fields, Link, Result, Version, STAC_VERSION};
 use chrono::{DateTime, FixedOffset, Utc};
 use geojson::{feature::Id, Feature, Geometry};
-use path_slash::PathBufExt;
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
 use stac_derive::{Href, Links, Migrate};
-use std::{collections::HashMap, path::PathBuf};
+use std::{collections::HashMap, path::Path};
 use url::Url;
 
 const TOP_LEVEL_ATTRIBUTES: [&str; 8] = [
@@ -286,7 +285,7 @@ impl Builder {
         let mut item = Item::new(self.id);
         for (key, mut asset) in self.assets {
             if Url::parse(&asset.href).is_err() && self.canonicalize_paths {
-                asset.href = PathBuf::from_slash(&asset.href)
+                asset.href = Path::new(&asset.href)
                     .canonicalize()?
                     .to_string_lossy()
                     .into_owned();

diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
@@ -168,7 +168,6 @@ mod item_asset;
 mod item_collection;
 mod json;
 mod ndjson;
-mod node;
 mod statistics;
 #[cfg(feature = "validate")]
 mod validate;
@@ -197,7 +196,6 @@ pub use {
     item_collection::ItemCollection,
     json::{FromJson, ToJson},
     ndjson::{FromNdjson, ToNdjson},
-    node::Node,
     statistics::Statistics,
     value::Value,
 };

diff --git a/crates/core/src/node.rs b/crates/core/src/node.rs
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
@@ -11,7 +11,6 @@ rust-version.workspace = true
 
 [dependencies]
 mime.workspace = true
-path-slash.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 thiserror.workspace = true