Skip to content

feat(datatypes): introduce encapsulated tile types (TileSize, TileIdx… #1265

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.

Sign up for GitHub

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

Draft
jdroenner wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(datatypes): introduce encapsulated tile types (TileSize, TileIdx… #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions geoengine/datatypes/src/raster/arrow_conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ mod tests {
use super::*;
use crate::{
primitives::{CacheHint, TimeInterval},
raster::{EmptyGrid2D, GridIndexAccessMut, MaskedGrid2D, TileInformation},
raster::{
EmptyGrid2D, GridIndexAccessMut, MaskedGrid2D, TileIdx, TileInformation, TileSize,
},
spatial_reference::SpatialReference,
util::test::TestDefault,
};
Expand Down Expand Up @@ -237,8 +239,8 @@ mod tests {
TimeInterval::default(),
TileInformation {
global_geo_transform: TestDefault::test_default(),
global_tile_position: [0, 0].into(),
tile_size_in_pixels: [3, 2].into(),
tile_position: TileIdx::new_y_x(0, 0),
tile_size: TileSize::new_y_x(3, 2),
},
0,
Grid2D::new([3, 2].into(), vec![1, 2, 3, 4, 5, 6])
Expand Down Expand Up @@ -288,8 +290,8 @@ mod tests {
TimeInterval::default(),
TileInformation {
global_geo_transform: TestDefault::test_default(),
global_tile_position: [0, 0].into(),
tile_size_in_pixels: [3, 2].into(),
tile_position: TileIdx::new_y_x(0, 0),
tile_size: TileSize::new_y_x(3, 2),
},
0,
EmptyGrid2D::<f64>::new([3, 2].into()).into(),
Expand Down
2 changes: 1 addition & 1 deletion geoengine/datatypes/src/raster/grid_spatial.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ impl TilingSpatialGridDefinition {
pub fn generate_data_tiling_strategy(&self) -> TilingStrategy {
TilingStrategy {
geo_transform: self.tiling_geo_transform(),
tile_size_in_pixels: self.tiling_specification.tile_size_in_pixels,
tile_size: self.tiling_specification.tile_size,
}
}

Expand Down
6 changes: 4 additions & 2 deletions geoengine/datatypes/src/raster/macros_raster_tile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,9 @@ macro_rules! call_generic_raster_tile_2d_ext {
mod tests {
use crate::{
primitives::{CacheHint, TimeInterval},
raster::{GeoTransform, Grid2D, GridIndexAccess, Pixel, RasterTile2D, TypedRasterTile2D},
raster::{
GeoTransform, Grid2D, GridIndexAccess, Pixel, RasterTile2D, TileIdx, TypedRasterTile2D,
},
util::test::TestDefault,
};
use crate::{raster::RasterDataType, util::test::catch_unwind_silent};
Expand Down Expand Up @@ -498,7 +500,7 @@ mod tests {

let typed_raster_a = TypedRasterTile2D::U32(RasterTile2D::new(
TimeInterval::default(),
[0, 0].into(),
TileIdx::new_y_x(0, 0),
0,
[1.0, 1.0, 0.0, 1.0, 0.0, -1.0].into(),
Grid2D::new([3, 2].into(), vec![1, 2, 3, 4, 5, 6])
Expand Down
5 changes: 4 additions & 1 deletion geoengine/datatypes/src/raster/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ pub use self::raster_tile::{
BaseTile, MaterializedRasterTile, MaterializedRasterTile2D, MaterializedRasterTile3D,
RasterTile, RasterTile2D, RasterTile3D, TilesEqualIgnoringCacheHint, display_raster_tile_2d,
};
pub use self::tiling::{TileInformation, TileInformationIter, TilingSpecification, TilingStrategy};
pub use self::tiling::{
TileIdx, TileIdx2DIter, TileInformation, TileInformationIter, TileSize, TilingSpecification,
TilingStrategy,
};
pub use self::typed_raster_conversion::TypedRasterConversion;
pub use self::typed_raster_tile::{TypedRasterTile2D, TypedRasterTile3D};
pub use self::{grid_traits::ChangeGridBounds, grid_traits::GridShapeAccess};
Expand Down
6 changes: 3 additions & 3 deletions geoengine/datatypes/src/raster/operations/checked_scaling.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ mod tests {

use crate::{
primitives::{CacheHint, TimeInterval},
raster::{GeoTransform, Grid2D, MaskedGrid2D},
raster::{GeoTransform, Grid2D, MaskedGrid2D, TileIdx},
util::test::TestDefault,
};

Expand Down Expand Up @@ -312,7 +312,7 @@ mod tests {
GridOrEmpty::Grid(Grid2D::new(dim.into(), data).unwrap().into());
let t1 = RasterTile2D::new(
TimeInterval::default(),
[0, 0].into(),
TileIdx::new_y_x(0, 0),
0,
geo,
r1,
Expand Down Expand Up @@ -371,7 +371,7 @@ mod tests {
let r1: GridOrEmpty2D<i32> = GridOrEmpty2D::from(Grid2D::new(dim.into(), data).unwrap());
let t1 = RasterTile2D::new(
TimeInterval::default(),
[0, 0].into(),
TileIdx::new_y_x(0, 0),
0,
geo,
r1,
Expand Down
10 changes: 5 additions & 5 deletions geoengine/datatypes/src/raster/operations/convert_data_type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ where
mod tests {
use crate::{
primitives::{CacheHint, TimeInterval},
raster::{EmptyGrid2D, GeoTransform, Grid2D, GridOrEmpty2D, RasterTile2D},
raster::{EmptyGrid2D, GeoTransform, Grid2D, GridOrEmpty2D, RasterTile2D, TileIdx},
};

use super::*;
Expand Down Expand Up @@ -236,7 +236,7 @@ mod tests {
let g_u8: GridOrEmpty2D<u8> = Grid2D::new_filled([32, 32].into(), 8).into();
let tile_u8 = RasterTile2D::new(
TimeInterval::default(),
[0, 0].into(),
TileIdx::new_y_x(0, 0),
0,
GeoTransform::new((0., 0.).into(), 1., -1.),
g_u8,
Expand All @@ -245,7 +245,7 @@ mod tests {
let tile_f64: RasterTile2D<f32> = tile_u8.convert_data_type();

assert_eq!(tile_f64.time, TimeInterval::default());
assert_eq!(tile_f64.tile_position, [0, 0].into());
assert_eq!(tile_f64.tile_position, TileIdx::new_y_x(0, 0));
assert_eq!(
tile_f64.global_geo_transform,
GeoTransform::new((0., 0.).into(), 1., -1.)
Expand All @@ -264,7 +264,7 @@ mod tests {
let g_u8: GridOrEmpty2D<u8> = Grid2D::new_filled([32, 32].into(), 8).into();
let tile_u8 = RasterTile2D::new(
TimeInterval::default(),
[0, 0].into(),
TileIdx::new_y_x(0, 0),
0,
GeoTransform::new((0., 0.).into(), 1., -1.),
g_u8,
Expand All @@ -273,7 +273,7 @@ mod tests {
let tile_f64: RasterTile2D<f32> = tile_u8.convert_data_type_parallel();

assert_eq!(tile_f64.time, TimeInterval::default());
assert_eq!(tile_f64.tile_position, [0, 0].into());
assert_eq!(tile_f64.tile_position, TileIdx::new_y_x(0, 0));
assert_eq!(
tile_f64.global_geo_transform,
GeoTransform::new((0., 0.).into(), 1., -1.)
Expand Down
18 changes: 9 additions & 9 deletions geoengine/datatypes/src/raster/operations/interpolation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ mod tests {
primitives::CacheHint,
raster::{
GeoTransform, GeoTransformAccess, Grid2D, GridOrEmpty, MaskedGrid, RasterTile2D,
TileInformation,
TileIdx, TileInformation, TileSize,
},
};

Expand All @@ -181,8 +181,8 @@ mod tests {
let input = RasterTile2D::new_with_tile_info(
Default::default(),
TileInformation {
global_tile_position: [0, 0].into(),
tile_size_in_pixels: [3, 3].into(),
tile_position: TileIdx::new_y_x(0, 0),
tile_size: TileSize::new_y_x(3, 3),
global_geo_transform: GeoTransform::new((0.0, 2.0).into(), 1.0, -1.0),
},
0,
Expand All @@ -196,8 +196,8 @@ mod tests {
let input_grid = input.into_inner_positioned_grid();

let output_info = TileInformation {
global_tile_position: [0, 0].into(),
tile_size_in_pixels: [3, 3].into(),
tile_position: TileIdx::new_y_x(0, 0),
tile_size: TileSize::new_y_x(3, 3),
global_geo_transform: GeoTransform::new((0.0, 2.0).into(), 0.5, -0.5),
};

Expand Down Expand Up @@ -266,8 +266,8 @@ mod tests {
let input = RasterTile2D::new_with_tile_info(
Default::default(),
TileInformation {
global_tile_position: [0, 0].into(),
tile_size_in_pixels: [3, 3].into(),
tile_position: TileIdx::new_y_x(0, 0),
tile_size: TileSize::new_y_x(3, 3),
global_geo_transform: GeoTransform::new((0.0, 2.0).into(), 1.0, -1.0),
},
0,
Expand All @@ -281,8 +281,8 @@ mod tests {
let input_grid = input.into_inner_positioned_grid();

let output_info = TileInformation {
global_tile_position: [0, 0].into(),
tile_size_in_pixels: [4, 4].into(),
tile_position: TileIdx::new_y_x(0, 0),
tile_size: TileSize::new_y_x(4, 4),
global_geo_transform: GeoTransform::new((0.0, 2.0).into(), 0.5, -0.5),
};

Expand Down
6 changes: 3 additions & 3 deletions geoengine/datatypes/src/raster/operations/map_elements.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ where
mod tests {
use crate::{
primitives::{CacheHint, TimeInterval},
raster::{EmptyGrid2D, GeoTransform, Grid2D},
raster::{EmptyGrid2D, GeoTransform, Grid2D, TileIdx},
util::test::TestDefault,
};

Expand Down Expand Up @@ -458,7 +458,7 @@ mod tests {
let r1 = GridOrEmpty::Grid(MaskedGrid::from(Grid2D::new(dim.into(), data).unwrap()));
let t1 = RasterTile2D::new(
TimeInterval::default(),
[0, 0].into(),
TileIdx::new_y_x(0, 0),
0,
geo,
r1,
Expand All @@ -482,7 +482,7 @@ mod tests {
let r1 = GridOrEmpty::Grid(MaskedGrid::from(Grid2D::new(dim.into(), data).unwrap()));
let t1 = RasterTile2D::new(
TimeInterval::default(),
[0, 0].into(),
TileIdx::new_y_x(0, 0),
0,
geo,
r1,
Expand Down
Loading
Loading