Migrated geo-traits-ext and geo-generic-alg

Author: Kontinuation

Cargo.lock

@@ -22,6 +22,9 @@ members = [
     "c/sedona-s2geography",
     "c/sedona-tg",
     "r/sedonadb/src/rust",
+    "rust/geo-traits-ext",
+    "rust/geo-generic-alg",
+    "rust/geo-test-fixtures",
     "rust/sedona-adbc",
     "rust/sedona-expr",
     "rust/sedona-functions",
@@ -54,7 +57,7 @@ rust-version = "1.82"
 [workspace.dependencies]
 approx = "0.5"
 abi_stable = "0.11.3"
-adbc_core = { git = "https://github.com/apache/arrow-adbc", rev = "1ba248290cd299c4969b679463bcd54c217cf2e4" }
+adbc_core = "0.20.0"
 lru = "0.12"
 arrow = { version = "55.1.0", features = ["prettyprint", "ffi", "chrono-tz"] }
 arrow-array = { version = "55.1.0" }
@@ -81,22 +84,20 @@ env_logger = "0.11"
 futures = { version = "0.3" }
 object_store = { version = "0.12.0", default-features = false }
 float_next_after = "1"
+num-traits = { version = "0.2", default-features = false, features = ["libm"] }
 mimalloc = { version = "0.1", default-features = false }
 libmimalloc-sys = { version = "0.1", default-features = false }
 
 geos = { version = "10.0.0", features = ["geo"] }
 
-# Use our own fork of georust/geo, which implements generic computational geometry algorithms for geo-traits
-geo-generic-alg = { git = "https://github.com/wherobots/geo.git", branch = "generic-alg", package = "geo-generic-alg" }
-geo-types = "0.7.16"
-geo-traits = "0.2.0"
-geo-traits-ext = "0.1.0"
-geo = { version = "0.30.0" }
+geo-types = "0.7.17"
+geo-traits = "0.3.0"
+geo = "0.31.0"
 
 geo-index = { version = "0.3.1" }
 
-wkb = { version = "0.8.0", features = ["geos"] }
-wkt = "0.13.0"
+wkb = { version = "0.9.0" }
+wkt = "0.14.0"
 
 parking_lot = "0.12"
 parquet = { version = "55.1.0", default-features = false, features = [
@@ -127,9 +128,5 @@ datafusion-ffi = { git = "https://github.com/paleolimbot/datafusion.git", branch
 datafusion-physical-expr = { git = "https://github.com/paleolimbot/datafusion.git", branch = "local-49-with-patch", package = "datafusion-physical-expr" }
 datafusion-physical-plan = { git = "https://github.com/paleolimbot/datafusion.git", branch = "local-49-with-patch", package = "datafusion-physical-plan" }
 
-geo-types = { git = "https://github.com/wherobots/geo.git", branch = "generic-alg", package = "geo-types" }
-geo-traits = { git = "https://github.com/wherobots/geo.git", branch = "generic-alg", package = "geo-traits" }
-geo-traits-ext = { git = "https://github.com/wherobots/geo.git", branch = "generic-alg", package = "geo-traits-ext" }
-geo-index = { git = "https://github.com/wherobots/geo-index.git", branch = "main" }
-wkb = { git = "https://github.com/wherobots/wkb.git", branch = "generic-alg" }
-wkt = { git = "https://github.com/wherobots/wkt.git", branch = "generic-alg" }
+# geo-index = { git = "https://github.com/Kontinuation/geo-index.git", branch = "geo-0.31.0" }
+geo-index = { path = "/Users/bopeng/workspace/github/geo-index" }

Cargo.toml

@@ -42,7 +42,7 @@ sedona-expr = { path = "../../rust/sedona-expr" }
 sedona-functions = { path = "../../rust/sedona-functions" }
 sedona-geometry = { path = "../../rust/sedona-geometry" }
 sedona-schema = { path = "../../rust/sedona-schema" }
-wkb = { workspace = true, features = ["geos"] }
+wkb = { workspace = true }
 
 [[bench]]
 harness = false

c/sedona-geos/Cargo.toml

@@ -0,0 +1,79 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+[package]
+name = "geo-generic-alg"
+version.workspace = true
+homepage.workspace = true
+repository.workspace = true
+description.workspace = true
+readme.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+
+[features]
+default = ["multithreading"]
+use-serde = ["serde", "geo-types/serde"]
+multithreading = ["i_overlay/allow_multithreading", "geo-types/multithreading"]
+
+[dependencies]
+float_next_after = { workspace = true }
+geo-traits = { workspace = true }
+geo-types = { workspace = true, features = ["approx", "use-rstar_0_12"] }
+geo-traits-ext = { path = "../geo-traits-ext" }
+log = "0.4.11"
+num-traits = { workspace = true }
+robust = "1.1.0"
+rstar = "0.12.0"
+serde = { workspace = true, features = ["derive"], optional = true }
+i_overlay = { version = "4.0.0, < 4.1.0", default-features = false }
+
+[dev-dependencies]
+geo-test-fixtures = { path = "../geo-test-fixtures" }
+approx = { workspace = true }
+criterion = { workspace = true }
+pretty_env_logger = "0.4"
+rand = { workspace = true }
+rand_distr = "0.4.3"
+geo = { workspace = true }
+wkt = { workspace = true }
+
+# For writing WKB geometry for benchmarks
+geos = { workspace = true, features = ["geo"] }
+
+[[bench]]
+name = "area"
+harness = false
+
+[[bench]]
+name = "intersection"
+harness = false
+
+[[bench]]
+name = "centroid"
+harness = false
+
+[[bench]]
+name = "length"
+harness = false
+
+[[bench]]
+name = "distance"
+harness = false
+
+[[bench]]
+name = "perimeter"
+harness = false

rust/geo-generic-alg/Cargo.toml

@@ -0,0 +1,22 @@
+# Generic Algorithms for Geo-Traits
+
+This crate provides the same algorithms as the `geo` crate, but applies traits
+defined in `geo-traits` instead of concrete geometry types defined in
+`geo-types`.
+
+We are still in the early stage of migrating the algorithms, and the crate is
+not ready for production use yet.
+
+## Status
+
+- [ ] Area calculation
+- [ ] Centroid calculation
+- [ ] Convex hull calculation
+- [ ] Relationships (contains, within, etc)
+- [ ] Simplification
+- [ ] Buffer
+- [ ] Distance
+- [ ] Intersection
+- [ ] Union
+- [ ] Difference
+- [ ] Symmetric difference

rust/geo-generic-alg/README.md

@@ -0,0 +1,53 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+use geo_generic_alg::Area;
+use geo_generic_alg::Polygon;
+use geo_traits::to_geo::ToGeoGeometry;
+
+#[path = "utils/wkb.rs"]
+mod wkb;
+
+fn criterion_benchmark(c: &mut Criterion) {
+    c.bench_function("area_f32", |bencher| {
+        let norway = geo_test_fixtures::norway_main::<f32>();
+        let polygon = Polygon::new(norway, vec![]);
+
+        bencher.iter(|| {
+            criterion::black_box(criterion::black_box(&polygon).signed_area());
+        });
+    });
+
+    c.bench_function("area", |bencher| {
+        let norway = geo_test_fixtures::norway_main::<f64>();
+        let polygon = Polygon::new(norway, vec![]);
+
+        bencher.iter(|| {
+            criterion::black_box(criterion::black_box(&polygon).signed_area());
+        });
+    });
+
+    c.bench_function("area_wkb", |bencher| {
+        let norway = geo_test_fixtures::norway_main::<f64>();
+        let polygon = Polygon::new(norway, vec![]);
+        let wkb_bytes = wkb::geo_to_wkb(&polygon);
+
+        bencher.iter(|| {
+            let wkb_geom = geo_generic_tests::wkb::reader::read_wkb(&wkb_bytes).unwrap();
+            criterion::black_box(wkb_geom.signed_area());
+        });
+    });
+
+    c.bench_function("area_wkb_convert", |bencher| {
+        let norway = geo_test_fixtures::norway_main::<f64>();
+        let polygon = Polygon::new(norway, vec![]);
+        let wkb_bytes = wkb::geo_to_wkb(&polygon);
+
+        bencher.iter(|| {
+            let wkb_geom = geo_generic_tests::wkb::reader::read_wkb(&wkb_bytes).unwrap();
+            let geom = wkb_geom.to_geometry();
+            criterion::black_box(geom.signed_area());
+        });
+    });
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);

rust/geo-generic-alg/benches/area.rs

@@ -0,0 +1,53 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+use geo_generic_alg::Centroid;
+use geo_generic_alg::Polygon;
+use geo_traits::to_geo::ToGeoGeometry;
+
+#[path = "utils/wkb.rs"]
+mod wkb;
+
+fn criterion_benchmark(c: &mut Criterion) {
+    c.bench_function("centroid_f32", |bencher| {
+        let norway = geo_test_fixtures::norway_main::<f32>();
+        let polygon = Polygon::new(norway, vec![]);
+
+        bencher.iter(|| {
+            criterion::black_box(criterion::black_box(&polygon).centroid());
+        });
+    });
+
+    c.bench_function("centroid", |bencher| {
+        let norway = geo_test_fixtures::norway_main::<f64>();
+        let polygon = Polygon::new(norway, vec![]);
+
+        bencher.iter(|| {
+            criterion::black_box(criterion::black_box(&polygon).centroid());
+        });
+    });
+
+    c.bench_function("centroid_wkb", |bencher| {
+        let norway = geo_test_fixtures::norway_main::<f64>();
+        let polygon = Polygon::new(norway, vec![]);
+        let wkb_bytes = wkb::geo_to_wkb(&polygon);
+
+        bencher.iter(|| {
+            let wkb_geom = geo_generic_tests::wkb::reader::read_wkb(&wkb_bytes).unwrap();
+            criterion::black_box(wkb_geom.centroid());
+        });
+    });
+
+    c.bench_function("centroid_wkb_convert", |bencher| {
+        let norway = geo_test_fixtures::norway_main::<f64>();
+        let polygon = Polygon::new(norway, vec![]);
+        let wkb_bytes = wkb::geo_to_wkb(&polygon);
+
+        bencher.iter(|| {
+            let wkb_geom = geo_generic_tests::wkb::reader::read_wkb(&wkb_bytes).unwrap();
+            let geom = wkb_geom.to_geometry();
+            criterion::black_box(geom.centroid());
+        });
+    });
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);