refactor: added more borrowing

Author: atsyplenkov

src/cells.rs

@@ -49,7 +49,7 @@ pub(crate) fn tile_to_cell(tile: Tile) -> Cell {
 }
 
 /// Convert Quadbin cell into a tile
-pub(crate) fn cell_to_tile(cell: Cell) -> Tile {
+pub(crate) fn cell_to_tile(cell: &Cell) -> Tile {
     assert!(cell.is_valid(), "Quadbin cell index is not valid");
 
     let cell64 = cell.get();
@@ -93,7 +93,7 @@ pub(crate) fn point_to_cell(lat: f64, lng: f64, res: u8) -> Cell {
 }
 
 /// Convert cell into point
-pub(crate) fn cell_to_point(cell: Cell) -> (f64, f64) {
+pub(crate) fn cell_to_point(cell: &Cell) -> (f64, f64) {
     assert!(cell.is_valid(), "Quadbin cell index is not valid");
 
     let tile = cell.to_tile();
@@ -104,7 +104,7 @@ pub(crate) fn cell_to_point(cell: Cell) -> (f64, f64) {
 }
 
 /// Compute the parent cell for a specific resolution.
-pub(crate) fn cell_to_parent(cell: Cell, parent_res: u8) -> Cell {
+pub(crate) fn cell_to_parent(cell: &Cell, parent_res: u8) -> Cell {
     // Check resolution
     let resolution = cell.resolution();
     assert!(

src/test/hashing.rs

@@ -16,7 +16,7 @@ fn test_tile_hashing() {
 
     for (tile, hash) in cases.iter() {
         // Tile to hash
-        assert_eq!(Tile::to_hash(*tile), *hash);
+        assert_eq!(Tile::to_hash(&tile), *hash);
         // Hash to tile
         assert_eq!(Tile::from_hash(*hash), *tile);
     }

src/test/utils.rs

@@ -85,17 +85,17 @@ fn test_tile_conversion() {
 #[test]
 fn test_tile_scalefactor() {
     assert_relative_eq!(
-        tile_scalefactor(Tile::new(384, 368, 10)),
+        tile_scalefactor(&Tile::new(384, 368, 10)),
         0.7075410884638627_f64,
         epsilon = ACC
     );
     assert_relative_eq!(
-        tile_scalefactor(Tile::new(384, 368, 26)),
+        tile_scalefactor(&Tile::new(384, 368, 26)),
         0.08626970361752928_f64,
         epsilon = ACC
     );
     assert_relative_eq!(
-        tile_scalefactor(Tile::new(100, 100, 10)),
+        tile_scalefactor(&Tile::new(100, 100, 10)),
         0.15910754230624527_f64,
         epsilon = ACC
     );

src/types.rs

@@ -37,27 +37,27 @@ impl Tile {
     ///
     /// See also [Tile::to_longitude].
     ///
-    pub fn to_latitude(self, offset: f64) -> f64 {
+    pub fn to_latitude(&self, offset: f64) -> f64 {
         tile_to_latitude(self, offset)
     }
 
     /// Return tile's longitude.
     ///
     /// See also [Tile::to_latitude].
     ///
-    pub fn to_longitude(self, offset: f64) -> f64 {
+    pub fn to_longitude(&self, offset: f64) -> f64 {
         tile_to_longitude(self, offset)
     }
 
     /// Get tile's siblings.
     // TODO:
     // Add examples. See how to properly document direction
-    pub fn get_sibling(self, direction: u8) -> Option<Self> {
+    pub fn get_sibling(&self, direction: u8) -> Option<Self> {
         tile_sibling(self, direction)
     }
 
     /// Compute a hash from the tile.
-    pub fn to_hash(self) -> u64 {
+    pub fn to_hash(&self) -> u64 {
         to_tile_hash(self)
     }
 
@@ -142,7 +142,7 @@ impl Cell {
     /// let parent = qb_cell.parent(2_u8);
     /// assert_eq!(parent, quadbin::Cell::new(5200813144682790911))
     /// ```
-    pub fn parent(self, parent_res: u8) -> Cell {
+    pub fn parent(&self, parent_res: u8) -> Cell {
         cell_to_parent(self, parent_res)
     }
 
@@ -182,7 +182,7 @@ impl Cell {
     ///
     /// Returns a tuple with latitude and longitude in degrees.
     ///
-    pub fn to_point(self) -> (f64, f64) {
+    pub fn to_point(&self) -> (f64, f64) {
         cell_to_point(self)
     }
 
@@ -199,7 +199,7 @@ impl Cell {
     }
 
     /// Convert a Quadbin cell into a tile.
-    pub(crate) fn to_tile(self) -> Tile {
+    pub(crate) fn to_tile(&self) -> Tile {
         cell_to_tile(self)
     }
 }

src/utils.rs

@@ -49,7 +49,7 @@ pub(crate) fn point_to_tile(lat: f64, lng: f64, res: u8) -> Tile {
 }
 
 /// Compute the latitude for a tile with an offset.
-pub(crate) fn tile_to_latitude(tile: Tile, offset: f64) -> f64 {
+pub(crate) fn tile_to_latitude(tile: &Tile, offset: f64) -> f64 {
     // Check if offset is between 0 and 1
     assert!(
         (0.0..=1.0).contains(&offset),
@@ -66,7 +66,7 @@ pub(crate) fn tile_to_latitude(tile: Tile, offset: f64) -> f64 {
 }
 
 /// Compute the longitude for a tile with an offset.
-pub(crate) fn tile_to_longitude(tile: Tile, offset: f64) -> f64 {
+pub(crate) fn tile_to_longitude(tile: &Tile, offset: f64) -> f64 {
     // Check if offset is between 0 and 1
     assert!(
         (0.0..=1.0).contains(&offset),
@@ -82,7 +82,7 @@ pub(crate) fn tile_to_longitude(tile: Tile, offset: f64) -> f64 {
 }
 
 /// Inverse of the scale factor at the tile center.
-pub(crate) fn tile_scalefactor(tile: Tile) -> f64 {
+pub(crate) fn tile_scalefactor(tile: &Tile) -> f64 {
     // Get Tile coords
     let y = tile.y as f64;
     let z2 = (1 << tile.z) as f64;
@@ -116,7 +116,7 @@ pub(crate) fn tile_area(tile: &Tile) -> f64 {
         let z_factor = |y_val: f64| -> f64 {
             // Create a new tile with the same x and z but different y
             let temp_tile = Tile::new(*x, y_val as u32, z as u8);
-            tile_scalefactor(temp_tile).powf(2.0)
+            tile_scalefactor(&temp_tile).powf(2.0)
         };
 
         area *= z_factor(y) / z_factor(center_y);
@@ -126,7 +126,7 @@ pub(crate) fn tile_area(tile: &Tile) -> f64 {
 }
 
 /// Compute the sibling (neighbour) tile in a specific direction.
-pub(crate) fn tile_sibling(tile: Tile, direction: u8) -> Option<Tile> {
+pub(crate) fn tile_sibling(tile: &Tile, direction: u8) -> Option<Tile> {
     // Early return for a low level == no neighbors
     // TODO: Think about what should one return instead of None
     if tile.z == 0_u8 {
@@ -180,7 +180,7 @@ pub(crate) fn tile_sibling(tile: Tile, direction: u8) -> Option<Tile> {
 }
 
 /// Compute a hash from the tile.
-pub(crate) fn to_tile_hash(tile: Tile) -> u64 {
+pub(crate) fn to_tile_hash(tile: &Tile) -> u64 {
     let x = tile.x as u64;
     let y = tile.y as u64;
     let z = tile.z as u64;