refactor(sedona-gdal): prefer imported raster helpers

Author: Kontinuation

c/sedona-gdal/src/raster/polygonize.rs

@@ -138,6 +138,7 @@ mod tests {
         use crate::global::with_global_gdal_api;
         use crate::raster::Buffer;
         use crate::vector::FieldDefn;
+        use crate::vsi::unlink_mem_file;
 
         with_global_gdal_api(|api| {
             let mem_driver = DriverManager::get_driver_by_name(api, "MEM").unwrap();
@@ -209,7 +210,7 @@ mod tests {
                 .count();
             assert_eq!(ones_8, 1);
 
-            crate::vsi::unlink_mem_file(api, gpkg_path).unwrap();
+            unlink_mem_file(api, gpkg_path).unwrap();
         })
         .unwrap();
     }
@@ -222,6 +223,7 @@ mod tests {
         use crate::global::with_global_gdal_api;
         use crate::raster::Buffer;
         use crate::vector::FieldDefn;
+        use crate::vsi::unlink_mem_file;
 
         with_global_gdal_api(|api| {
             let mem_driver = DriverManager::get_driver_by_name(api, "MEM").unwrap();
@@ -267,7 +269,7 @@ mod tests {
             let only_val = layer.features().next().unwrap().field_as_integer(0);
             assert_eq!(only_val, Some(7));
 
-            crate::vsi::unlink_mem_file(api, gpkg_path).unwrap();
+            unlink_mem_file(api, gpkg_path).unwrap();
         })
         .unwrap();
     }

c/sedona-gdal/src/raster/rasterize.rs

@@ -23,7 +23,7 @@ use std::ptr;
 
 use crate::cpl::CslStringList;
 use crate::dataset::Dataset;
-use crate::errors::Result;
+use crate::errors::{GdalError, Result};
 use crate::gdal_api::{call_gdal_api, GdalApi};
 use crate::gdal_dyn_bindgen::*;
 use crate::vector::Geometry;
@@ -147,12 +147,12 @@ pub fn rasterize(
     options: Option<RasterizeOptions>,
 ) -> Result<()> {
     if band_list.is_empty() {
-        return Err(crate::errors::GdalError::BadArgument(
+        return Err(GdalError::BadArgument(
             "`band_list` must not be empty".to_string(),
         ));
     }
     if burn_values.len() != geometries.len() {
-        return Err(crate::errors::GdalError::BadArgument(format!(
+        return Err(GdalError::BadArgument(format!(
             "burn_values length ({}) must match geometries length ({})",
             burn_values.len(),
             geometries.len()
@@ -162,7 +162,7 @@ pub fn rasterize(
     for &band in band_list {
         let is_good = band > 0 && (band as usize) <= raster_count;
         if !is_good {
-            return Err(crate::errors::GdalError::BadArgument(format!(
+            return Err(GdalError::BadArgument(format!(
                 "Band index {} is out of bounds",
                 band
             )));
@@ -211,6 +211,8 @@ pub fn rasterize(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::driver::DriverManager;
+    use crate::global::with_global_gdal_api;
 
     #[test]
     fn test_rasterizeoptions_as_ptr() {
@@ -237,11 +239,11 @@ mod tests {
     #[cfg(feature = "gdal-sys")]
     #[test]
     fn test_rasterize() {
-        crate::global::with_global_gdal_api(|api| {
+        with_global_gdal_api(|api| {
             let wkt = "POLYGON ((2 2, 2 4.25, 4.25 4.25, 4.25 2, 2 2))";
             let poly = Geometry::from_wkt(api, wkt).unwrap();
 
-            let driver = crate::driver::DriverManager::get_driver_by_name(api, "MEM").unwrap();
+            let driver = DriverManager::get_driver_by_name(api, "MEM").unwrap();
             let dataset = driver.create("", 5, 5, 1).unwrap();
 
             let bands = [1];

c/sedona-gdal/src/raster/rasterize_affine.rs

@@ -178,8 +178,8 @@ mod tests {
 
     use crate::driver::{Driver, DriverManager};
     use crate::global::with_global_gdal_api;
-    use crate::raster::rasterize;
     use crate::raster::types::Buffer;
+    use crate::raster::{rasterize, RasterizeOptions};
 
     fn mem_driver(api: &'static GdalApi) -> Driver {
         DriverManager::get_driver_by_name(api, "MEM").unwrap()
@@ -284,7 +284,7 @@ mod tests {
                 &[1],
                 &geom_refs,
                 &[1.0],
-                Some(crate::raster::RasterizeOptions {
+                Some(RasterizeOptions {
                     all_touched: true,
                     ..Default::default()
                 }),