diff --git a/Cargo.lock b/Cargo.lock index 8f0ffb7..6923322 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1434,13 +1434,28 @@ dependencies = [ "fallible-streaming-iterator", "flatbuffers 24.12.23", "geo-traits", - "geozero", + "geozero 0.14.0", "http-range-client", "log", "reqwest", "tempfile", ] +[[package]] +name = "flatgeobuf" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "440aaa920020917f3d52b61d82f871d945d9707cbec6c33a5c55a2d85b385121" +dependencies = [ + "byteorder", + "fallible-streaming-iterator", + "flatbuffers 24.12.23", + "geo-traits", + "geozero 0.15.1", + "log", + "tempfile", +] + [[package]] name = "float_next_after" version = "1.0.0" @@ -1609,6 +1624,26 @@ dependencies = [ "spade", ] +[[package]] +name = "geo" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3901269ec6d4f6068d3f09e5f02f995bd076398dcd1dfec407cd230b02d11b" +dependencies = [ + "earcutr", + "float_next_after", + "geo-types", + "geographiclib-rs", + "i_overlay", + "log", + "num-traits", + "rand 0.8.7", + "robust", + "rstar 0.12.2", + "sif-itree", + "spade", +] + [[package]] name = "geo-traits" version = "0.3.0" @@ -1649,7 +1684,7 @@ dependencies = [ "geo-types", "geoarrow-schema", "geoarrow-test", - "geozero", + "geozero 0.14.0", "num-traits", "wkb", "wkt 0.14.0", @@ -1663,7 +1698,7 @@ checksum = "8e4a62ac19c86827c6ec81ea584594b3ee96db5a8119b9774d3466c6b373c434" dependencies = [ "arrow-array", "arrow-buffer", - "geo", + "geo 0.31.0", "geo-traits", "geoarrow-array", "geoarrow-schema", @@ -1682,12 +1717,12 @@ dependencies = [ "async-trait", "bytes", "chrono", - "flatgeobuf", + "flatgeobuf 5.0.0", "futures", "geo-traits", "geoarrow-array", "geoarrow-schema", - "geozero", + "geozero 0.14.0", "http-range-client", "indexmap 2.14.0", "object_store", @@ -1739,7 +1774,7 @@ dependencies = [ "arrow-buffer", "arrow-schema", "datafusion", - "geo", + "geo 0.32.0", "geo-traits", "geoarrow-array", "geoarrow-expr-geo", @@ -1747,7 +1782,7 @@ dependencies = [ "geohash", "geos", "object_store", - "thiserror 1.0.69", + "thiserror 2.0.17", "tokio", "wkt 0.14.0", ] @@ -1762,7 +1797,7 @@ dependencies = [ "async-trait", "datafusion", "datafusion-datasource", - "flatgeobuf", + "flatgeobuf 6.0.1", "futures", "geo-traits", "geoarrow-array", @@ -1790,7 +1825,7 @@ dependencies = [ "geoarrow-geojson", "geoarrow-schema", "geodatafusion", - "geojson", + "geojson 1.0.0", "object_store", "serde_json", "tempfile", @@ -1829,9 +1864,9 @@ dependencies = [ [[package]] name = "geohash" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fb94b1a65401d6cbf22958a9040aa364812c26674f841bee538b12c135db1e6" +checksum = "7f58890382f70caccc5fa388981f7ac80c913795042afce9f3e065695d8f7464" dependencies = [ "geo-types", "libm", @@ -1842,12 +1877,25 @@ name = "geojson" version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e26f3c45b36fccc9cf2805e61d4da6bc4bbd5a3a9589b01afa3a40eff703bd79" +dependencies = [ + "log", + "serde", + "serde_json", + "thiserror 2.0.17", +] + +[[package]] +name = "geojson" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510c094bfc76ea34d02eee00833254945b70491d79a9c0b050abed6eaa799ffb" dependencies = [ "geo-types", "log", "serde", "serde_json", "thiserror 2.0.17", + "tinyvec", ] [[package]] @@ -1901,13 +1949,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5f28f34864745eb2f123c990c6ffd92c1584bd39439b3f27ff2a0f4ea5b309b" dependencies = [ "geo-types", - "geojson", + "geojson 0.24.2", "log", "serde_json", "thiserror 1.0.69", "wkt 0.11.1", ] +[[package]] +name = "geozero" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db5eda63aa99ac06160fd53328ed75c34f14e3196d3f56a3649e247ed796e54b" +dependencies = [ + "log", + "serde_json", + "thiserror 2.0.17", +] + [[package]] name = "getrandom" version = "0.2.16" @@ -2578,9 +2637,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" @@ -2599,9 +2658,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "lru-slab" @@ -3052,13 +3111,24 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +[[package]] +name = "rand" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + [[package]] name = "rand" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "rand_chacha", + "rand_chacha 0.9.0", "rand_core 0.9.3", ] @@ -3073,6 +3143,16 @@ dependencies = [ "rand_core 0.10.0", ] +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + [[package]] name = "rand_chacha" version = "0.9.0" @@ -3083,6 +3163,15 @@ dependencies = [ "rand_core 0.9.3", ] +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + [[package]] name = "rand_core" version = "0.9.3" @@ -3325,9 +3414,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags 2.9.4", "errno", @@ -3510,15 +3599,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -3570,6 +3659,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "sif-itree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f45b8998ced5134fb1d75732c77842a3e888f19c1ff98481822e8fbfbf930b" + [[package]] name = "simd-adler32" version = "0.3.7" @@ -3728,12 +3823,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.23.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.3", + "getrandom 0.4.2", "once_cell", "rustix", "windows-sys 0.61.2", @@ -3846,6 +3941,7 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ + "serde", "tinyvec_macros", ] @@ -4619,9 +4715,9 @@ dependencies = [ [[package]] name = "wkb" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "908e92c755a5f5ff8781c1c7ebcedb60ce5443879d20f4a0b6a1ee8fb3e6dfb6" +checksum = "a120b336c7ad17749026d50427c23d838ecb50cd64aaea6254b5030152f890a9" dependencies = [ "byteorder", "geo-traits", @@ -4770,6 +4866,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" +[[package]] +name = "zmij" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" + [[package]] name = "zstd" version = "0.13.3" diff --git a/Cargo.toml b/Cargo.toml index d83dd83..c7b603a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,9 +27,9 @@ async-trait = "0.1" datafusion = { version = "54", default-features = false } datafusion-datasource = { version = "54", default-features = false } datafusion-datasource-parquet = "54" -flatgeobuf = { version = "5.0", default-features = false } +flatgeobuf = { version = "6.0", default-features = false } futures = "0.3" -geo = "0.31.0" +geo = "0.32.0" geo-traits = "0.3.0" geoarrow-array = "0.8.0" geoarrow-flatgeobuf = "0.8.0" @@ -38,14 +38,14 @@ geoarrow-geojson = "0.8.0" geoarrow-schema = "0.8.0" geodatafusion = { path = "rust/geodatafusion", version = "0.5.0" } geohash = "0.13.1" -geojson = "0.24" +geojson = "1.0" geoparquet = "0.8.0" geos = { version = "11.1", default-features = false } http-range-client = { version = "0.9", default-features = false } object_store = "0.13.2" serde_json = "1" tempfile = "3" -thiserror = "1" +thiserror = "2" tokio = { version = "1.9", default-features = false } wkb = "0.9" wkt = "0.14"