Skip to content

Commit e53efe4

Browse files
committed
Add sedona- prefix to geo-traits-ext, geo-generic-alg and geo-test-fixtures
1 parent 2a97569 commit e53efe4

File tree

108 files changed

+294
-280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+294
-280
lines changed

Cargo.lock

Lines changed: 47 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ members = [
2222
"c/sedona-s2geography",
2323
"c/sedona-tg",
2424
"r/sedonadb/src/rust",
25-
"rust/geo-traits-ext",
26-
"rust/geo-generic-alg",
27-
"rust/geo-test-fixtures",
25+
"rust/sedona-geo-traits-ext",
26+
"rust/sedona-geo-generic-alg",
27+
"rust/sedona-geo-test-fixtures",
2828
"rust/sedona-adbc",
2929
"rust/sedona-expr",
3030
"rust/sedona-functions",

dev/release/rat_exclude_files.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ r/sedonadb/DESCRIPTION
1818
r/sedonadb/NAMESPACE
1919
r/sedonadb/src/sedonadb-win.def
2020
submodules/geoarrow-data/*
21-
rust/geo-test-fixtures/fixtures/*.wkt
21+
rust/sedona-geo-test-fixtures/fixtures/*.wkt

rust/geo-generic-alg/Cargo.toml renamed to rust/sedona-geo-generic-alg/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717
[package]
18-
name = "geo-generic-alg"
18+
name = "sedona-geo-generic-alg"
1919
version.workspace = true
2020
homepage.workspace = true
2121
repository.workspace = true
@@ -33,7 +33,7 @@ multithreading = ["i_overlay/allow_multithreading", "geo-types/multithreading"]
3333
float_next_after = { workspace = true }
3434
geo-traits = { workspace = true }
3535
geo-types = { workspace = true, features = ["approx", "use-rstar_0_12"] }
36-
geo-traits-ext = { path = "../geo-traits-ext" }
36+
sedona-geo-traits-ext = { path = "../sedona-geo-traits-ext" }
3737
log = "0.4.11"
3838
num-traits = { workspace = true }
3939
robust = "1.1.0"
@@ -42,7 +42,7 @@ serde = { workspace = true, features = ["derive"], optional = true }
4242
i_overlay = { version = "4.0.0, < 4.1.0", default-features = false }
4343

4444
[dev-dependencies]
45-
geo-test-fixtures = { path = "../geo-test-fixtures" }
45+
sedona-geo-test-fixtures = { path = "../sedona-geo-test-fixtures" }
4646
approx = { workspace = true }
4747
criterion = { workspace = true }
4848
pretty_env_logger = "0.4"
File renamed without changes.

rust/geo-generic-alg/benches/area.rs renamed to rust/sedona-geo-generic-alg/benches/area.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717
use criterion::{criterion_group, criterion_main, Criterion};
18-
use geo_generic_alg::Area;
19-
use geo_generic_alg::Polygon;
2018
use geo_traits::to_geo::ToGeoGeometry;
19+
use sedona_geo_generic_alg::Area;
20+
use sedona_geo_generic_alg::Polygon;
2121

2222
#[path = "utils/wkb_util.rs"]
2323
mod wkb_util;
2424

2525
fn criterion_benchmark(c: &mut Criterion) {
2626
c.bench_function("area_generic_f32", |bencher| {
27-
let norway = geo_test_fixtures::norway_main::<f32>();
27+
let norway = sedona_geo_test_fixtures::norway_main::<f32>();
2828
let polygon = Polygon::new(norway, vec![]);
2929

3030
bencher.iter(|| {
@@ -33,7 +33,7 @@ fn criterion_benchmark(c: &mut Criterion) {
3333
});
3434

3535
c.bench_function("area_generic", |bencher| {
36-
let norway = geo_test_fixtures::norway_main::<f64>();
36+
let norway = sedona_geo_test_fixtures::norway_main::<f64>();
3737
let polygon = Polygon::new(norway, vec![]);
3838

3939
bencher.iter(|| {
@@ -42,7 +42,7 @@ fn criterion_benchmark(c: &mut Criterion) {
4242
});
4343

4444
c.bench_function("area_geo_f32", |bencher| {
45-
let norway = geo_test_fixtures::norway_main::<f32>();
45+
let norway = sedona_geo_test_fixtures::norway_main::<f32>();
4646
let polygon = Polygon::new(norway, vec![]);
4747

4848
bencher.iter(|| {
@@ -51,7 +51,7 @@ fn criterion_benchmark(c: &mut Criterion) {
5151
});
5252

5353
c.bench_function("area_geo", |bencher| {
54-
let norway = geo_test_fixtures::norway_main::<f64>();
54+
let norway = sedona_geo_test_fixtures::norway_main::<f64>();
5555
let polygon = Polygon::new(norway, vec![]);
5656

5757
bencher.iter(|| {
@@ -60,7 +60,7 @@ fn criterion_benchmark(c: &mut Criterion) {
6060
});
6161

6262
c.bench_function("area_wkb", |bencher| {
63-
let norway = geo_test_fixtures::norway_main::<f64>();
63+
let norway = sedona_geo_test_fixtures::norway_main::<f64>();
6464
let polygon = Polygon::new(norway, vec![]);
6565
let wkb_bytes = wkb_util::geo_to_wkb(polygon);
6666

@@ -71,7 +71,7 @@ fn criterion_benchmark(c: &mut Criterion) {
7171
});
7272

7373
c.bench_function("area_wkb_convert", |bencher| {
74-
let norway = geo_test_fixtures::norway_main::<f64>();
74+
let norway = sedona_geo_test_fixtures::norway_main::<f64>();
7575
let polygon = Polygon::new(norway, vec![]);
7676
let wkb_bytes = wkb_util::geo_to_wkb(polygon);
7777

rust/geo-generic-alg/benches/centroid.rs renamed to rust/sedona-geo-generic-alg/benches/centroid.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717
use criterion::{criterion_group, criterion_main, Criterion};
18-
use geo_generic_alg::Centroid;
19-
use geo_generic_alg::Polygon;
2018
use geo_traits::to_geo::ToGeoGeometry;
19+
use sedona_geo_generic_alg::Centroid;
20+
use sedona_geo_generic_alg::Polygon;
2121

2222
#[path = "utils/wkb_util.rs"]
2323
mod wkb_util;
2424

2525
fn criterion_benchmark(c: &mut Criterion) {
2626
c.bench_function("centroid_generic_f32", |bencher| {
27-
let norway = geo_test_fixtures::norway_main::<f32>();
27+
let norway = sedona_geo_test_fixtures::norway_main::<f32>();
2828
let polygon = Polygon::new(norway, vec![]);
2929

3030
bencher.iter(|| {
@@ -33,7 +33,7 @@ fn criterion_benchmark(c: &mut Criterion) {
3333
});
3434

3535
c.bench_function("centroid_generic", |bencher| {
36-
let norway = geo_test_fixtures::norway_main::<f64>();
36+
let norway = sedona_geo_test_fixtures::norway_main::<f64>();
3737
let polygon = Polygon::new(norway, vec![]);
3838

3939
bencher.iter(|| {
@@ -42,7 +42,7 @@ fn criterion_benchmark(c: &mut Criterion) {
4242
});
4343

4444
c.bench_function("centroid_geo_f32", |bencher| {
45-
let norway = geo_test_fixtures::norway_main::<f32>();
45+
let norway = sedona_geo_test_fixtures::norway_main::<f32>();
4646
let polygon = Polygon::new(norway, vec![]);
4747

4848
bencher.iter(|| {
@@ -51,7 +51,7 @@ fn criterion_benchmark(c: &mut Criterion) {
5151
});
5252

5353
c.bench_function("centroid_geo", |bencher| {
54-
let norway = geo_test_fixtures::norway_main::<f64>();
54+
let norway = sedona_geo_test_fixtures::norway_main::<f64>();
5555
let polygon = Polygon::new(norway, vec![]);
5656

5757
bencher.iter(|| {
@@ -60,7 +60,7 @@ fn criterion_benchmark(c: &mut Criterion) {
6060
});
6161

6262
c.bench_function("centroid_wkb", |bencher| {
63-
let norway = geo_test_fixtures::norway_main::<f64>();
63+
let norway = sedona_geo_test_fixtures::norway_main::<f64>();
6464
let polygon = Polygon::new(norway, vec![]);
6565
let wkb_bytes = wkb_util::geo_to_wkb(polygon);
6666

@@ -71,7 +71,7 @@ fn criterion_benchmark(c: &mut Criterion) {
7171
});
7272

7373
c.bench_function("centroid_wkb_convert", |bencher| {
74-
let norway = geo_test_fixtures::norway_main::<f64>();
74+
let norway = sedona_geo_test_fixtures::norway_main::<f64>();
7575
let polygon = Polygon::new(norway, vec![]);
7676
let wkb_bytes = wkb_util::geo_to_wkb(polygon);
7777

rust/geo-generic-alg/benches/distance.rs renamed to rust/sedona-geo-generic-alg/benches/distance.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// under the License.
1717
use criterion::{criterion_group, criterion_main, Criterion};
1818
use geo::{Distance as GeoDistance, Euclidean};
19-
use geo_generic_alg::algorithm::line_measures::DistanceExt;
20-
use geo_generic_alg::{coord, LineString, MultiPolygon, Point, Polygon};
19+
use sedona_geo_generic_alg::algorithm::line_measures::DistanceExt;
20+
use sedona_geo_generic_alg::{coord, LineString, MultiPolygon, Point, Polygon};
2121

2222
#[path = "utils/wkb_util.rs"]
2323
mod wkb_util;
@@ -79,7 +79,7 @@ fn criterion_benchmark(c: &mut Criterion) {
7979
});
8080

8181
c.bench_function("distance_linestring_to_linestring", |bencher| {
82-
let ls1 = geo_test_fixtures::norway_main::<f64>();
82+
let ls1 = sedona_geo_test_fixtures::norway_main::<f64>();
8383
let ls2 = LineString::from(vec![
8484
coord!(x: 100.0, y: 100.0),
8585
coord!(x: 200.0, y: 200.0),
@@ -136,7 +136,7 @@ fn criterion_benchmark(c: &mut Criterion) {
136136
});
137137

138138
c.bench_function("distance_wkb_linestring_to_linestring", |bencher| {
139-
let ls1 = geo_test_fixtures::norway_main::<f64>();
139+
let ls1 = sedona_geo_test_fixtures::norway_main::<f64>();
140140
let ls2 = LineString::from(vec![
141141
coord!(x: 100.0, y: 100.0),
142142
coord!(x: 200.0, y: 200.0),
@@ -195,7 +195,7 @@ fn criterion_benchmark(c: &mut Criterion) {
195195
});
196196

197197
c.bench_function("distance_concrete_linestring_to_linestring", |bencher| {
198-
let ls1 = geo_test_fixtures::norway_main::<f64>();
198+
let ls1 = sedona_geo_test_fixtures::norway_main::<f64>();
199199
let ls2 = LineString::from(vec![
200200
coord!(x: 100.0, y: 100.0),
201201
coord!(x: 200.0, y: 200.0),

0 commit comments

Comments
 (0)