diff --git a/Cargo.lock b/Cargo.lock index ed92f94a..91b53962 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -865,9 +865,9 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" [[package]] name = "gdal" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7691fc763e24396e3e0a7853573273cf2fc786798bf624db3162f3174536521" +checksum = "6639365794fa1f35f36f8cd3e2ea21c94c9b04aa8d9ee0d0f3324621efeb0800" dependencies = [ "bitflags 2.4.0", "chrono", @@ -892,9 +892,9 @@ dependencies = [ [[package]] name = "geo" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" dependencies = [ "earcutr", "float_next_after", @@ -904,13 +904,14 @@ dependencies = [ "num-traits", "robust", "rstar", + "spade", ] [[package]] name = "geo-types" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" +checksum = "567495020b114f1ce9bed679b29975aa0bfae06ac22beacd5cfde5dabe7b05d6" dependencies = [ "approx", "num-traits", @@ -940,7 +941,7 @@ dependencies = [ "geodesy", "geos", "geozero", - "itertools 0.11.0", + "itertools 0.12.0", "num_enum", "parquet", "proj", @@ -1181,9 +1182,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -1864,6 +1865,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +[[package]] +name = "spade" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab085cfe5486093ca290034bd2d424e283f9725b4bcf8ba5a7f6c7612b59841c" +dependencies = [ + "num-traits", + "robust", + "smallvec", +] + [[package]] name = "spin" version = "0.9.8" diff --git a/Cargo.toml b/Cargo.toml index df929f51..b6528091 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,12 +32,12 @@ bumpalo = { version = "3", features = ["collections"] } byteorder = "1" # Set default-features = false because async not working in wasm right now flatgeobuf = { version = "3.27.0", optional = true, default-features = false } -gdal = { version = "0.15", optional = true } -geo = "0.26" +gdal = { version = "0.16", optional = true } +geo = "0.27" geodesy = { version = "0.11", optional = true } geos = { version = "8.3", features = ["v3_10_0", "geo"], optional = true } geozero = { version = "0.11", features = ["with-wkb"], optional = true } -itertools = "0.11" +itertools = "0.12" num_enum = "0.7" proj = { version = "0.27.2", optional = true, features = [ "pkg_config", diff --git a/js/Cargo.lock b/js/Cargo.lock index 4b7de17d..a1dbc9a2 100644 --- a/js/Cargo.lock +++ b/js/Cargo.lock @@ -796,9 +796,9 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" [[package]] name = "geo" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" dependencies = [ "earcutr", "float_next_after", @@ -808,13 +808,14 @@ dependencies = [ "num-traits", "robust", "rstar", + "spade", ] [[package]] name = "geo-types" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" +checksum = "567495020b114f1ce9bed679b29975aa0bfae06ac22beacd5cfde5dabe7b05d6" dependencies = [ "approx", "num-traits", @@ -856,7 +857,7 @@ dependencies = [ "byteorder", "geo", "geodesy", - "itertools 0.11.0", + "itertools 0.12.0", "num_enum", "rstar", "thiserror", @@ -1015,9 +1016,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -1443,6 +1444,17 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +[[package]] +name = "spade" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab085cfe5486093ca290034bd2d424e283f9725b4bcf8ba5a7f6c7612b59841c" +dependencies = [ + "num-traits", + "robust", + "smallvec", +] + [[package]] name = "spin" version = "0.9.8" diff --git a/js/Cargo.toml b/js/Cargo.toml index c90c825c..fad2c801 100644 --- a/js/Cargo.toml +++ b/js/Cargo.toml @@ -47,7 +47,7 @@ console_error_panic_hook = { version = "0.1.6", optional = true } geoarrow = { path = "../", package = "geoarrow2" } thiserror = "1" -geo = "0.26" +geo = "0.27" geodesy = { version = "0.11", optional = true, features = ["js"] } # Pass "wasm" and "thin" down to the transitive zstd dependency diff --git a/python/geoarrow-rust/Cargo.lock b/python/geoarrow-rust/Cargo.lock index 129fa032..efd535b4 100644 --- a/python/geoarrow-rust/Cargo.lock +++ b/python/geoarrow-rust/Cargo.lock @@ -439,9 +439,9 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" [[package]] name = "geo" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" dependencies = [ "earcutr", "float_next_after", @@ -451,13 +451,14 @@ dependencies = [ "num-traits", "robust", "rstar", + "spade", ] [[package]] name = "geo-types" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" +checksum = "567495020b114f1ce9bed679b29975aa0bfae06ac22beacd5cfde5dabe7b05d6" dependencies = [ "approx", "num-traits", @@ -493,7 +494,7 @@ dependencies = [ "bumpalo", "byteorder", "geo", - "itertools 0.11.0", + "itertools 0.12.0", "num_enum", "rstar", "thiserror", @@ -624,9 +625,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -1098,6 +1099,17 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +[[package]] +name = "spade" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab085cfe5486093ca290034bd2d424e283f9725b4bcf8ba5a7f6c7612b59841c" +dependencies = [ + "num-traits", + "robust", + "smallvec", +] + [[package]] name = "spin" version = "0.9.8" diff --git a/python/geoarrow-rust/Cargo.toml b/python/geoarrow-rust/Cargo.toml index 9ee214ba..b579a23d 100644 --- a/python/geoarrow-rust/Cargo.toml +++ b/python/geoarrow-rust/Cargo.toml @@ -17,9 +17,6 @@ name = "rust" crate-type = ["cdylib"] [dependencies] -# arrow-array = "48" -# arrow-buffer = "48" -# arrow = "48" arrow-array = { git = "https://github.com/apache/arrow-rs", rev="fbbb61d94282165f9bb9f73fb4d00a3af16d4aee" } arrow-buffer = { git = "https://github.com/apache/arrow-rs", rev="fbbb61d94282165f9bb9f73fb4d00a3af16d4aee" } arrow = { git = "https://github.com/apache/arrow-rs", rev="fbbb61d94282165f9bb9f73fb4d00a3af16d4aee", features = ["ffi"] } @@ -32,4 +29,4 @@ pyo3 = { version = "0.20.0", features = [ ] } geoarrow = { path = "../../", package = "geoarrow2" } thiserror = "1" -geo = "0.26" +geo = "0.27"