Add basic cog support

Cargo.toml

@@ -34,6 +34,7 @@ anyhow = "1.0"
 approx = "0.5.1"
 async-trait = "0.1"
 bit-set = "0.8"
+bytemuck = "1.19.0"
 brotli = ">=5, <8"
 cargo-husky = { version = "1", features = ["user-hooks"], default-features = false }
 clap = { version = "4", features = ["derive"] }
@@ -45,6 +46,7 @@ env_logger = "0.11"
 flate2 = "1"
 flume = "0.11"
 futures = "0.3"
+image = "0.25.5"
 indoc = "2"
 insta = "1"
 itertools = "0.13"
@@ -59,6 +61,7 @@ moka = { version = "0.12", features = ["future"] }
 num_cpus = "1"
 pbf_font_tools = { version = "2.5.1", features = ["freetype"] }
 pmtiles = { version = "0.11", features = ["http-async", "mmap-async-tokio", "tilejson", "reqwest-rustls-tls-native-roots"] }
+png = "0.17.14"
 postgis = "0.9"
 postgres = { version = "0.19", features = ["with-time-0_3", "with-uuid-1", "with-serde_json-1"] }
 postgres-protocol = "0.6"
@@ -85,6 +88,7 @@ static-files = "0.2"
 subst = { version = "0.3", features = ["yaml"] }
 testcontainers-modules = { version = "0.11.3", features = ["postgres"] }
 thiserror = "1"
+tiff = "0.9.1"
 tile-grid = "0.6"
 tilejson = "0.4"
 tokio = { version = "1", features = ["macros"] }

martin/Cargo.toml

@@ -59,12 +59,13 @@ name = "bench"
 harness = false
 
 [features]
-default = ["webui", "fonts", "lambda", "mbtiles", "pmtiles", "postgres", "sprites"]
+default = ["webui", "fonts", "lambda", "mbtiles", "pmtiles", "cog", "postgres", "sprites"]
 webui = ["dep:actix-web-static-files", "dep:static-files"]
 fonts = ["dep:bit-set", "dep:pbf_font_tools"]
 lambda = ["dep:lambda-web"]
 mbtiles = ["dep:mbtiles"]
 pmtiles = ["dep:pmtiles"]
+cog = ["dep:tiff", "dep:png", "dep:bytemuck"]
 postgres = ["dep:deadpool-postgres", "dep:json-patch", "dep:postgis", "dep:postgres", "dep:postgres-protocol", "dep:semver", "dep:tokio-postgres-rustls"]
 sprites = ["dep:spreet", "tokio/fs"]
 bless-tests = []
@@ -77,12 +78,14 @@ actix-web-static-files = { workspace = true, optional = true }
 actix-web.workspace = true
 async-trait.workspace = true
 bit-set = { workspace = true, optional = true }
+bytemuck = { workspace = true, optional = true }
 brotli.workspace = true
 clap.workspace = true
 deadpool-postgres = { workspace = true, optional = true }
 enum-display.workspace = true
 env_logger.workspace = true
 futures.workspace = true
+image = {workspace = true, optional=true }
 itertools.workspace = true
 json-patch = { workspace = true, optional = true }
 lambda-web = { workspace = true, optional = true }
@@ -93,6 +96,7 @@ moka.workspace = true
 num_cpus.workspace = true
 pbf_font_tools = { workspace = true, optional = true }
 pmtiles = { workspace = true, optional = true }
+png= { workspace = true, optional=true }
 postgis = { workspace = true, optional = true }
 postgres = { workspace = true, optional = true }
 postgres-protocol = { workspace = true, optional = true }
@@ -101,14 +105,15 @@ rustls-native-certs.workspace = true
 rustls-pemfile.workspace = true
 rustls.workspace = true
 semver = { workspace = true, optional = true }
-serde.workspace = true
 serde_json.workspace = true
 serde_with.workspace = true
 serde_yaml.workspace = true
+serde.workspace = true
 spreet = { workspace = true, optional = true }
 static-files = { workspace = true, optional = true }
 subst.workspace = true
 thiserror.workspace = true
+tiff= { workspace = true, optional=true }
 tilejson.workspace = true
 tokio = { workspace = true, features = ["io-std"] }
 tokio-postgres-rustls = { workspace = true, optional = true }

martin/src/cog/errors.rs

@@ -0,0 +1,40 @@
+use std::path::PathBuf;
+
+use png::EncodingError;
+use tiff::TiffError;
+
+#[derive(thiserror::Error, Debug)]
+pub enum CogError {
+    #[error("Couldn't decoded {1} as tiff file: {0}")]
+    InvalidTifFile(TiffError, PathBuf),
+
+    #[error("Requested zoom level:{0} from file {1} is  out of range, the zoom level is from {2} to {3}")]
+    ZoomOutOfRange(u8, PathBuf, u8, u8),
+
+    #[error("Couldn't find any image(the tiff tag newsubfile is not mask) in the tiff file: {0}")]
+    NoImagesFound(PathBuf),
+
+    #[error("Couldn't seek to ifd number {1} (0 based indexing) in tiff file {2} : {0}")]
+    IfdSeekFailed(TiffError, usize, PathBuf),
+
+    #[error("Too many images in the tiff file: {0}")]
+    TooManyImages(PathBuf),
+
+    #[error("Couldn't find tags {1:?} at ifd {2} of tiff file {3} : {0}")]
+    TagsNotFound(TiffError, Vec<u16>, usize, PathBuf),
+
+    #[error("Planar configuration not equals to 1 is not supported, the tiff file is {2}")]
+    PlanaConfigurationNotSupported(PathBuf, usize, u16),
+
+    #[error("Failed to transform {1}th tile data at ifd {2} from {3} to png: {0}")]
+    ToPngBytesFailed(TiffError, u32, usize, PathBuf),
+
+    #[error("Failed to read {1}th chunk(0 based index) at ifd {2} from tiff file {3}: {0}")]
+    ReadChunkFailed(TiffError, u32, usize, PathBuf),
+
+    #[error("Failed to write header of png file at {0}, the color  type is {1:?}, the bit depth is {2:?}: {3}")]
+    WritePngHeaderFailed(PathBuf, png::ColorType, png::BitDepth, EncodingError),
+
+    #[error("Failed to write pixel bytes to png file at {0}: {1}")]
+    WriteToPngFailed(PathBuf, EncodingError),
+}