Skip to content

Commit 35a0469

Browse files
committed
Switch from geo to geo-types for dev dependency sedona-geos
1 parent 706d363 commit 35a0469

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

c/sedona-geos/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ criterion = { workspace = true }
3131
sedona = { path = "../../rust/sedona" }
3232
sedona-testing = { path = "../../rust/sedona-testing", features = ["criterion"] }
3333
rstest = { workspace = true }
34-
geo = { workspace = true }
34+
geo-types = { workspace = true }
3535

3636
[dependencies]
3737
arrow-schema = { workspace = true }

c/sedona-geos/benches/wkb_to_geos.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717
use criterion::{criterion_group, criterion_main};
18-
use geo::{LineString, Point};
18+
use geo_types::{LineString, Point};
1919
use sedona_geos::wkb_to_geos::GEOSWkbFactory;
2020
use wkb::Endianness;
2121

c/sedona-geos/src/wkb_to_geos.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ fn save_f64_to_scratch<B: ByteOrder>(scratch: &mut Vec<f64>, buf: &[u8], num_ord
288288
#[cfg(test)]
289289
mod test {
290290
use super::*;
291-
use geo::{
291+
use geo_types::{
292292
line_string, point, polygon, Geometry, GeometryCollection, LineString, MultiLineString,
293293
MultiPoint, MultiPolygon, Point, Polygon,
294294
};
@@ -483,7 +483,7 @@ mod test {
483483
let mut buf = Vec::new();
484484
write_line_string(
485485
&mut buf,
486-
&geo::LineString::new(vec![]),
486+
&LineString::new(vec![]),
487487
&WriteOptions {
488488
endianness: Endianness::LittleEndian,
489489
},
@@ -528,7 +528,7 @@ mod test {
528528
let mut buf = Vec::new();
529529
write_multi_point(
530530
&mut buf,
531-
&geo::MultiPoint::new(vec![]),
531+
&MultiPoint::new(vec![]),
532532
&WriteOptions {
533533
endianness: Endianness::LittleEndian,
534534
},
@@ -555,7 +555,7 @@ mod test {
555555
let mut buf = Vec::new();
556556
write_multi_line_string(
557557
&mut buf,
558-
&geo::MultiLineString::new(vec![]),
558+
&MultiLineString::new(vec![]),
559559
&WriteOptions {
560560
endianness: Endianness::LittleEndian,
561561
},
@@ -582,7 +582,7 @@ mod test {
582582
let mut buf = Vec::new();
583583
write_multi_polygon(
584584
&mut buf,
585-
&geo::MultiPolygon::new(vec![]),
585+
&MultiPolygon::new(vec![]),
586586
&WriteOptions {
587587
endianness: Endianness::LittleEndian,
588588
},
@@ -609,7 +609,7 @@ mod test {
609609
let mut buf = Vec::new();
610610
write_geometry_collection(
611611
&mut buf,
612-
&geo::GeometryCollection::new_from(vec![]),
612+
&GeometryCollection::new_from(vec![]),
613613
&WriteOptions {
614614
endianness: Endianness::LittleEndian,
615615
},
@@ -625,17 +625,17 @@ mod test {
625625
#[test]
626626
fn test_nested_geometry_collection() {
627627
// Create a geometry collection containing other geometry collections
628-
let inner_gc1 = geo::GeometryCollection::new_from(vec![
628+
let inner_gc1 = GeometryCollection::new_from(vec![
629629
Geometry::Point(point_2d()),
630630
Geometry::LineString(linestring_2d()),
631631
]);
632632

633-
let inner_gc2 = geo::GeometryCollection::new_from(vec![
633+
let inner_gc2 = GeometryCollection::new_from(vec![
634634
Geometry::Polygon(polygon_2d()),
635635
Geometry::MultiPoint(multi_point_2d()),
636636
]);
637637

638-
let outer_gc = geo::GeometryCollection::new_from(vec![
638+
let outer_gc = GeometryCollection::new_from(vec![
639639
Geometry::GeometryCollection(inner_gc1),
640640
Geometry::GeometryCollection(inner_gc2),
641641
Geometry::MultiLineString(multi_line_string_2d()),
@@ -650,7 +650,7 @@ mod test {
650650
#[test]
651651
fn test_coordinate_precision() {
652652
// Test with high precision coordinates
653-
let high_precision_point = geo::Point::new(123.456789012345, -98.765432109876);
653+
let high_precision_point = Point::new(123.456789012345, -98.765432109876);
654654
let geo_geom = Geometry::Point(high_precision_point);
655655

656656
test_geometry_conversion(&geo_geom, Endianness::LittleEndian);
@@ -660,7 +660,7 @@ mod test {
660660
#[test]
661661
fn test_large_coordinates() {
662662
// Test with very large coordinate values
663-
let large_point = geo::Point::new(1e10, -1e10);
663+
let large_point = Point::new(1e10, -1e10);
664664
let geo_geom = Geometry::Point(large_point);
665665

666666
test_geometry_conversion(&geo_geom, Endianness::LittleEndian);
@@ -670,7 +670,7 @@ mod test {
670670
#[test]
671671
fn test_negative_coordinates() {
672672
// Test with negative coordinates
673-
let negative_point = geo::Point::new(-180.0, -90.0);
673+
let negative_point = Point::new(-180.0, -90.0);
674674
let geo_geom = Geometry::Point(negative_point);
675675

676676
test_geometry_conversion(&geo_geom, Endianness::LittleEndian);
@@ -680,7 +680,7 @@ mod test {
680680
#[test]
681681
fn test_zero_coordinates() {
682682
// Test with zero coordinates
683-
let zero_point = geo::Point::new(0.0, 0.0);
683+
let zero_point = Point::new(0.0, 0.0);
684684
let geo_geom = Geometry::Point(zero_point);
685685

686686
test_geometry_conversion(&geo_geom, Endianness::LittleEndian);

0 commit comments

Comments
 (0)