Merge remote-tracking branch 'my/st_transform' into st_transform

Signed-off-by: Fan Yang <yangfanlinux@gmail.com> # Conflicts: # src/query/functions/src/scalars/geometry.rs
databendlabs · Jul 9, 2024 · 3578f89 · 3578f89
2 parents ad185cb + 0e45834
commit 3578f89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/query/functions/Cargo.toml b/src/query/functions/Cargo.toml
@@ -50,7 +50,7 @@ ordered-float = { workspace = true, features = [
     "serde",
     "rand",
 ] }
-proj = { git = "https://github.com/georust/proj", branch = "main" }
+proj = { git = "https://github.com/kkk25641463/proj.git", branch = "main", features = ["bundled_proj"] }
 rand = { workspace = true }
 regex = { workspace = true }
 roaring = "0.10.1"

diff --git a/src/query/functions/src/scalars/geometry.rs b/src/query/functions/src/scalars/geometry.rs
@@ -1825,7 +1825,7 @@ fn round_geometry_coordinates(geom: geo::Geometry<f64>) -> geo::Geometry<f64> {
                         .map(|coord| coord!( x:round_coordinate(coord.x), y:round_coordinate(coord.y)))
                         .collect(),
                 ),
-                rounded_inner_rings.try_into().unwrap(),
+                rounded_inner_rings,
             );
 
             geo::Geometry::Polygon(rounded_polygon)
@@ -1868,7 +1868,7 @@ fn round_geometry_coordinates(geom: geo::Geometry<f64>) -> geo::Geometry<f64> {
                         rounded_inner_rings.push(LineString(rounded_coords));
                     }
 
-                    Polygon::new(LineString(outer_ring), rounded_inner_rings.try_into().unwrap())
+                    Polygon::new(LineString(outer_ring), rounded_inner_rings)
                 })
                 .collect();
             geo::Geometry::MultiPolygon(geo::MultiPolygon::new(rounded_polygons))