-
Notifications
You must be signed in to change notification settings - Fork 197
feat(vortex-spatial): preserve GeoArrow metadata #9363
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
HarukiMoriarty
wants to merge
1
commit into
develop
Choose a base branch
from
nemo/geo-metadata
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: Copyright the Vortex contributors | ||
|
|
||
| //! Native geometry helpers and conversion to [`geo_types::Geometry`] for `geo` algorithms. | ||
|
|
||
| use geo_types::Geometry; | ||
| use vortex_array::ArrayRef; | ||
| use vortex_array::ExecutionCtx; | ||
| use vortex_array::IntoArray; | ||
| use vortex_array::arrays::ConstantArray; | ||
| use vortex_array::arrays::ExtensionArray; | ||
| use vortex_array::arrays::ListViewArray; | ||
| use vortex_array::arrays::StructArray; | ||
| use vortex_array::arrays::extension::ExtensionArrayExt; | ||
| use vortex_array::arrays::list::ListArraySlotsExt; | ||
| use vortex_array::arrays::listview::ListViewArraySlotsExt; | ||
| use vortex_array::arrays::listview::list_from_list_view; | ||
| use vortex_array::builtins::ArrayBuiltins; | ||
| use vortex_array::dtype::DType; | ||
| use vortex_array::dtype::Nullability; | ||
| use vortex_array::dtype::PType; | ||
| use vortex_array::scalar::Scalar; | ||
| use vortex_buffer::Buffer; | ||
| use vortex_error::VortexResult; | ||
| use vortex_error::vortex_bail; | ||
| use vortex_error::vortex_err; | ||
|
|
||
| use super::LineString; | ||
| use super::MultiLineString; | ||
| use super::MultiPoint; | ||
| use super::MultiPolygon; | ||
| use super::Point; | ||
| use super::Polygon; | ||
| use super::Rect; | ||
| use super::linestring_geometries; | ||
| use super::multilinestring_geometries; | ||
| use super::multipoint_geometries; | ||
| use super::multipolygon_geometries; | ||
| use super::point_geometries; | ||
| use super::polygon_geometries; | ||
| use super::rect_geometries; | ||
|
|
||
| /// Whether `dtype` is a native geometry extension type. | ||
| pub(crate) fn is_native_geometry(dtype: &DType) -> bool { | ||
| dtype.as_extension_opt().is_some_and(|ext| { | ||
| ext.is::<Point>() | ||
| || ext.is::<LineString>() | ||
| || ext.is::<MultiPoint>() | ||
| || ext.is::<Polygon>() | ||
| || ext.is::<MultiLineString>() | ||
| || ext.is::<MultiPolygon>() | ||
| || ext.is::<Rect>() | ||
| }) | ||
| } | ||
|
|
||
| /// Flatten a native geometry column to its coordinates. | ||
| pub(crate) fn flatten_coordinates( | ||
| array: &ArrayRef, | ||
| ctx: &mut ExecutionCtx, | ||
| ) -> VortexResult<StructArray> { | ||
| if !is_native_geometry(array.dtype()) { | ||
| vortex_bail!( | ||
| "spatial: operand is not a native geometry extension type, was {}", | ||
| array.dtype() | ||
| ); | ||
| } | ||
| let mut node = array | ||
| .clone() | ||
| .execute::<ExtensionArray>(ctx)? | ||
| .storage_array() | ||
| .clone(); | ||
| while node.dtype().is_list() { | ||
| node = node.execute::<ListViewArray>(ctx)?.elements().clone(); | ||
| } | ||
| node.execute::<StructArray>(ctx) | ||
| } | ||
|
|
||
| /// Flatten native geometry storage and return each row's coordinate offsets. | ||
| pub(crate) fn flatten_row_offsets( | ||
| storage: ArrayRef, | ||
| ctx: &mut ExecutionCtx, | ||
| ) -> VortexResult<(Vec<usize>, StructArray)> { | ||
| let mut row_offsets: Vec<usize> = (0..=storage.len()).collect(); | ||
| let mut level = storage; | ||
| while level.dtype().is_list() { | ||
| let list = list_from_list_view(level.execute::<ListViewArray>(ctx)?, ctx)?; | ||
| let offsets = list | ||
| .offsets() | ||
| .clone() | ||
| .cast(DType::Primitive(PType::U64, Nullability::NonNullable))? | ||
| .execute::<Buffer<u64>>(ctx)?; | ||
| for row_offset in &mut row_offsets { | ||
| *row_offset = usize::try_from(offsets[*row_offset]) | ||
| .map_err(|_| vortex_err!("spatial: list offset exceeds usize"))?; | ||
| } | ||
| level = list.elements().clone(); | ||
| } | ||
| Ok((row_offsets, level.execute::<StructArray>(ctx)?)) | ||
| } | ||
|
|
||
| /// Decode a native geometry column to `geo_types`. | ||
| pub(crate) fn geometries( | ||
| array: &ArrayRef, | ||
| ctx: &mut ExecutionCtx, | ||
| ) -> VortexResult<Vec<Geometry<f64>>> { | ||
| let Some(ext) = array.dtype().as_extension_opt() else { | ||
| vortex_bail!( | ||
| "spatial: operand is not a geometry extension type, was {}", | ||
| array.dtype() | ||
| ); | ||
| }; | ||
| let storage = array | ||
| .clone() | ||
| .execute::<ExtensionArray>(ctx)? | ||
| .storage_array() | ||
| .clone(); | ||
| if ext.is::<Point>() { | ||
| point_geometries(&storage, ext.metadata::<Point>(), ctx) | ||
| } else if ext.is::<LineString>() { | ||
| linestring_geometries(&storage, ext.metadata::<LineString>(), ctx) | ||
| } else if ext.is::<MultiPoint>() { | ||
| multipoint_geometries(&storage, ext.metadata::<MultiPoint>(), ctx) | ||
| } else if ext.is::<Polygon>() { | ||
| polygon_geometries(&storage, ext.metadata::<Polygon>(), ctx) | ||
| } else if ext.is::<MultiLineString>() { | ||
| multilinestring_geometries(&storage, ext.metadata::<MultiLineString>(), ctx) | ||
| } else if ext.is::<MultiPolygon>() { | ||
| multipolygon_geometries(&storage, ext.metadata::<MultiPolygon>(), ctx) | ||
| } else if ext.is::<Rect>() { | ||
| rect_geometries(&storage, ext.metadata::<Rect>(), ctx) | ||
| } else { | ||
| vortex_bail!("spatial: unsupported geometry extension {}", array.dtype()) | ||
| } | ||
| } | ||
|
|
||
| /// Decode a constant operand to one geometry. | ||
| pub(crate) fn single_geometry( | ||
| scalar: &Scalar, | ||
| ctx: &mut ExecutionCtx, | ||
| ) -> VortexResult<Geometry<f64>> { | ||
| let array = ConstantArray::new(scalar.clone(), 1).into_array(); | ||
| geometries(&array, ctx)? | ||
| .pop() | ||
| .ok_or_else(|| vortex_err!("spatial: constant operand decoded to no geometry")) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
might as well just add a constructor that takes
crs?