pixel based query rects for raster requests

Cargo.toml

@@ -8,7 +8,7 @@ exclude = [
 resolver = "2"
 
 [workspace.package]
-version = "0.8.0"
+version = "0.9.0"
 authors = [
     "Christian Beilschmidt <[email protected]>",
     "Johannes Drönner <[email protected]>",
@@ -156,6 +156,7 @@ pwhash = "1.0"
 quote = "1.0"
 rand = "0.9"
 rayon = "1.8"
+regex = "1.11"
 reqwest = { version = "0.12", features = [
     "json",
     "multipart",

Settings-default.toml

@@ -34,8 +34,6 @@ password = "geoengine"
 clear_database_on_start = false
 
 [raster.tiling_specification]
-origin_coordinate_x = 0.0
-origin_coordinate_y = 0.0
 tile_shape_pixels_x = 512
 tile_shape_pixels_y = 512
 

Settings-test.toml

@@ -10,8 +10,6 @@ password = "geoengine"
 raster_data_root_path = "../test_data/raster" # relative to sub crate directory for tests
 
 [raster.tiling_specification]
-origin_coordinate_x = 0.0
-origin_coordinate_y = 0.0
 tile_shape_pixels_x = 512
 tile_shape_pixels_y = 512
 

datatypes/Cargo.toml

@@ -18,6 +18,7 @@ arrow-schema = { workspace = true }
 bytes = { workspace = true }
 chrono = { workspace = true }
 fallible-iterator = { workspace = true }
+futures = { workspace = true }
 float-cmp = { workspace = true }
 gdal = { workspace = true }
 geo = { workspace = true }

datatypes/src/error.rs

@@ -104,6 +104,11 @@ pub enum Error {
         i2: TimeInterval,
     },
 
+    #[snafu(display("Time step must be greater than zero, got: {}", step))]
+    TimeStepStepMustBeGreaterThanZero {
+        step: u32,
+    },
+
     #[snafu(display(
         "{} must be larger than {} and {} must be smaller than {}",
         start.inner(),
@@ -294,7 +299,7 @@ pub enum Error {
     WrongMetadataType,
 
     #[snafu(display(
-        "The conditions ul.x < lr.x && ul.y < lr.y are not met by ul:{} lr:{}",
+        "The conditions ul.x < lr.x && ul.y > lr.y are not met by ul:{} lr:{}",
         upper_left_coordinate,
         lower_right_coordinate
     ))]
@@ -345,6 +350,8 @@ pub enum Error {
     DuplicateBandInQueryBandSelection,
     QueryBandSelectionMustNotBeEmpty,
 
+    TilingGeoTransformOriginCoordinateMismatch,
+    TilingGeoTransformResolutionMissmatch,
     #[snafu(display("Invalid number of suffixes, expected {} found {}", expected, found))]
     InvalidNumberOfSuffixes {
         expected: usize,
@@ -363,6 +370,11 @@ pub enum Error {
         expected: usize,
         found: usize,
     },
+    NoIntersectionWithTargetProjection {
+        srs_in: SpatialReference,
+        srs_out: SpatialReference,
+        bounds: BoundingBox2D,
+    },
 }
 
 impl From<arrow::error::ArrowError> for Error {

datatypes/src/operations/image/colorizer.rs

@@ -46,6 +46,16 @@ impl From<Colorizer> for RasterColorizer {
     }
 }
 
+impl RasterColorizer {
+    /// Returns the no data color of this raster colorizer
+    pub fn no_data_color(&self) -> RgbaColor {
+        match self {
+            RasterColorizer::SingleBand { band_colorizer, .. } => band_colorizer.no_data_color(),
+            RasterColorizer::MultiBand { rgb_params, .. } => rgb_params.no_data_color,
+        }
+    }
+}
+
 /// The parameters for the RGBA colorizer
 #[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "camelCase")]

datatypes/src/operations/image/mod.rs

@@ -8,4 +8,4 @@ pub use colorizer::{
 };
 pub use into_lossy::LossyInto;
 pub use rgba_transmutable::RgbaTransmutable;
-pub use to_png::ToPng;
+pub use to_png::{ToPng, create_empty_no_data_color_png_bytes};

datatypes/src/operations/image/to_png.rs

@@ -34,6 +34,15 @@ pub trait ToPng {
     ) -> Result<Vec<u8>>;
 }
 
+pub fn create_empty_no_data_color_png_bytes(
+    width: u32,
+    height: u32,
+    no_data_color: RgbaColor,
+) -> Result<Vec<u8>> {
+    let image_buffer = ImageBuffer::from_pixel(width, height, no_data_color.into());
+    image_buffer_to_png_bytes(image_buffer)
+}
+
 fn image_buffer_to_png_bytes(
     image_buffer: ImageBuffer<image::Rgba<u8>, Vec<u8>>,
 ) -> Result<Vec<u8>> {
@@ -121,9 +130,7 @@ where
     ) -> Result<Vec<u8>> {
         // TODO: use PNG color palette once it is available
 
-        let image_buffer = ImageBuffer::from_pixel(width, height, no_data_color.into());
-
-        image_buffer_to_png_bytes(image_buffer)
+        create_empty_no_data_color_png_bytes(width, height, no_data_color)
     }
 }