Rename TiffTile to Tile

Author: kylebarron

python/src/tile.rs

@@ -1,4 +1,4 @@
-use async_tiff::TiffTile;
+use async_tiff::Tile;
 use pyo3::prelude::*;
 use pyo3_async_runtimes::tokio::future_into_py;
 use pyo3_bytes::PyBytes;
@@ -9,7 +9,7 @@ use crate::thread_pool::{get_default_pool, PyThreadPool};
 use crate::PyDecoderRegistry;
 
 #[pyclass(name = "Tile")]
-pub(crate) struct PyTile(Option<TiffTile>);
+pub(crate) struct PyTile(Option<Tile>);
 
 #[pymethods]
 impl PyTile {

src/ifd.rs

@@ -14,7 +14,7 @@ use crate::tiff::tags::{
 };
 use crate::tiff::TiffError;
 use crate::tiff::Value;
-use crate::tile::TiffTile;
+use crate::tile::Tile;
 use crate::AsyncFileReader;
 
 const DOCUMENT_NAME: u16 = 269;
@@ -712,12 +712,12 @@ impl ImageFileDirectory {
         x: usize,
         y: usize,
         reader: &dyn AsyncFileReader,
-    ) -> Result<TiffTile> {
+    ) -> Result<Tile> {
         let range = self
             .get_tile_byte_range(x, y)
             .ok_or(AiocogeoError::General("Not a tiled TIFF".to_string()))?;
         let compressed_bytes = reader.get_bytes(range).await?;
-        Ok(TiffTile {
+        Ok(Tile {
             x,
             y,
             compressed_bytes,
@@ -732,7 +732,7 @@ impl ImageFileDirectory {
         x: &[usize],
         y: &[usize],
         reader: &dyn AsyncFileReader,
-    ) -> Result<Vec<TiffTile>> {
+    ) -> Result<Vec<Tile>> {
         assert_eq!(x.len(), y.len(), "x and y should have same len");
 
         // 1: Get all the byte ranges for all tiles
@@ -751,7 +751,7 @@ impl ImageFileDirectory {
         // 3: Create tile objects
         let mut tiles = vec![];
         for ((compressed_bytes, &x), &y) in buffers.into_iter().zip(x).zip(y) {
-            let tile = TiffTile {
+            let tile = Tile {
                 x,
                 y,
                 compressed_bytes,

src/lib.rs

@@ -12,4 +12,4 @@ mod tile;
 pub use async_reader::{AsyncFileReader, ObjectReader, PrefetchReader};
 pub use cog::COGReader;
 pub use ifd::{ImageFileDirectories, ImageFileDirectory};
-pub use tile::TiffTile;
+pub use tile::Tile;

src/tile.rs

@@ -12,7 +12,7 @@ use crate::tiff::{TiffError, TiffUnsupportedError};
 ///
 /// This is returned by `fetch_tile`.
 #[derive(Debug)]
-pub struct TiffTile {
+pub struct Tile {
     pub(crate) x: usize,
     pub(crate) y: usize,
     pub(crate) compressed_bytes: Bytes,
@@ -21,7 +21,7 @@ pub struct TiffTile {
     pub(crate) jpeg_tables: Option<Bytes>,
 }
 
-impl TiffTile {
+impl Tile {
     /// The column index of this tile.
     pub fn x(&self) -> usize {
         self.x