Merge remote-tracking branch 'origin/feature/grid_tiles' into feature…

…/grid_tiles
databrickslabs · Oct 13, 2023 · 19773fe · 19773fe
2 parents 7170697 + 9b79122
commit 19773fe
Show file tree

Hide file tree

Showing 39 changed files with 74 additions and 60 deletions.
diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/MosaicRaster.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/MosaicRaster.scala
@@ -3,7 +3,7 @@ package com.databricks.labs.mosaic.core.raster
 import com.databricks.labs.mosaic.core.geometry.MosaicGeometry
 import com.databricks.labs.mosaic.core.geometry.api.GeometryAPI
 import com.databricks.labs.mosaic.core.index.IndexSystem
-import com.databricks.labs.mosaic.core.raster.gdal_raster.{RasterCleaner, RasterWriter}
+import com.databricks.labs.mosaic.core.raster.io.{RasterCleaner, RasterWriter}
 import org.gdal.gdal.Dataset
 import org.gdal.osr.SpatialReference
 

diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/MosaicRasterBand.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/MosaicRasterBand.scala
@@ -8,6 +8,7 @@ trait MosaicRasterBand extends Serializable {
 
     def isNoDataMask: Boolean
 
+    /** @return Return the status flags of the mask band associated with the band */
     def maskFlags: Seq[Any]
 
     /** @return Returns the bandId of the band. */

diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/api/GDAL.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/api/GDAL.scala
@@ -0,0 +1,29 @@
+package com.databricks.labs.mosaic.core.raster.api
+
+import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
+
+import org.gdal.gdal.gdal
+
+/**
+ * GDAL Raster API. It uses [[MosaicRasterGDAL]] as the [[RasterReader]].
+ */
+object GDAL extends RasterAPI(MosaicRasterGDAL) {
+
+    override def name: String = "GDAL"
+
+    /**
+     * Enables GDAL on the worker nodes. GDAL requires drivers to be
+     * registered on the worker nodes. This method registers all the
+     * drivers on the worker nodes.
+     */
+    override def enable(): Unit = {
+        gdal.UseExceptions()
+        if (gdal.GetDriverCount() == 0) gdal.AllRegister()
+    }
+
+    override def getExtension(driverShortName: String): String = {
+        val driver = gdal.GetDriverByName(driverShortName)
+        driver.GetMetadataItem("DMD_EXTENSION")
+    }
+
+}
diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/api/RasterAPI.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/api/RasterAPI.scala
@@ -1,11 +1,12 @@
 package com.databricks.labs.mosaic.core.raster.api
 
 import com.databricks.labs.mosaic.core.raster._
-import com.databricks.labs.mosaic.core.raster.gdal_raster.{MosaicRasterGDAL, RasterCleaner, RasterReader, RasterTransform}
+import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
+import com.databricks.labs.mosaic.core.raster.io.{RasterCleaner, RasterReader}
+import com.databricks.labs.mosaic.core.raster.operator.transform.RasterTransform
 import com.databricks.labs.mosaic.utils.PathUtils
 import org.apache.spark.sql.types.{BinaryType, DataType, StringType}
 import org.apache.spark.unsafe.types.UTF8String
-import org.gdal.gdal.gdal
 
 import java.util.UUID
 
@@ -165,28 +166,6 @@ object RasterAPI extends Serializable {
             case "GDAL" => MosaicRasterGDAL
         }
 
-    /**
-      * GDAL Raster API. It uses [[MosaicRasterGDAL]] as the [[RasterReader]].
-      */
-    object GDAL extends RasterAPI(MosaicRasterGDAL) {
-
-        override def name: String = "GDAL"
-
-        /**
-          * Enables GDAL on the worker nodes. GDAL requires drivers to be
-          * registered on the worker nodes. This method registers all the
-          * drivers on the worker nodes.
-          */
-        override def enable(): Unit = {
-            gdal.UseExceptions()
-            if (gdal.GetDriverCount() == 0) gdal.AllRegister()
-        }
 
-        override def getExtension(driverShortName: String): String = {
-            val driver = gdal.GetDriverByName(driverShortName)
-            driver.GetMetadataItem("DMD_EXTENSION")
-        }
-
-    }
 
 }
diff --git a/...ic/core/raster/MosaicRasterBandGDAL.scala → ...re/raster/gdal/MosaicRasterBandGDAL.scala b/...ic/core/raster/MosaicRasterBandGDAL.scala → ...re/raster/gdal/MosaicRasterBandGDAL.scala
@@ -1,5 +1,6 @@
-package com.databricks.labs.mosaic.core.raster
+package com.databricks.labs.mosaic.core.raster.gdal
 
+import com.databricks.labs.mosaic.core.raster.MosaicRasterBand
 import org.gdal.gdal.Band
 import org.gdal.gdalconst.gdalconstConstants
 

diff --git a/...raster/gdal_raster/MosaicRasterGDAL.scala → ...c/core/raster/gdal/MosaicRasterGDAL.scala b/...raster/gdal_raster/MosaicRasterGDAL.scala → ...c/core/raster/gdal/MosaicRasterGDAL.scala
@@ -1,10 +1,11 @@
-package com.databricks.labs.mosaic.core.raster.gdal_raster
+package com.databricks.labs.mosaic.core.raster.gdal
 
 import com.databricks.labs.mosaic.GDAL
 import com.databricks.labs.mosaic.core.geometry.MosaicGeometry
 import com.databricks.labs.mosaic.core.geometry.api.GeometryAPI
 import com.databricks.labs.mosaic.core.index.IndexSystem
 import com.databricks.labs.mosaic.core.raster._
+import com.databricks.labs.mosaic.core.raster.io.{RasterCleaner, RasterReader}
 import com.databricks.labs.mosaic.core.raster.operator.clip.RasterClipByVector
 import com.databricks.labs.mosaic.core.types.model.GeometryTypeEnum.POLYGON
 import com.databricks.labs.mosaic.utils.PathUtils

diff --git a/...re/raster/gdal_raster/RasterCleaner.scala → ...mosaic/core/raster/io/RasterCleaner.scala b/...re/raster/gdal_raster/RasterCleaner.scala → ...mosaic/core/raster/io/RasterCleaner.scala
@@ -1,4 +1,4 @@
-package com.databricks.labs.mosaic.core.raster.gdal_raster
+package com.databricks.labs.mosaic.core.raster.io
 
 import com.databricks.labs.mosaic.core.raster.MosaicRaster
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile

diff --git a/...ore/raster/gdal_raster/RasterReader.scala → .../mosaic/core/raster/io/RasterReader.scala b/...ore/raster/gdal_raster/RasterReader.scala → .../mosaic/core/raster/io/RasterReader.scala
@@ -1,4 +1,4 @@
-package com.databricks.labs.mosaic.core.raster.gdal_raster
+package com.databricks.labs.mosaic.core.raster.io
 
 import com.databricks.labs.mosaic.core.raster.{MosaicRaster, MosaicRasterBand}
 import org.apache.spark.internal.Logging

diff --git a/...ore/raster/gdal_raster/RasterWriter.scala → .../mosaic/core/raster/io/RasterWriter.scala b/...ore/raster/gdal_raster/RasterWriter.scala → .../mosaic/core/raster/io/RasterWriter.scala
@@ -1,4 +1,4 @@
-package com.databricks.labs.mosaic.core.raster.gdal_raster
+package com.databricks.labs.mosaic.core.raster.io
 
 /**
   * RasterWriter is a trait that defines the interface for writing raster data

diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/operator/NDVI.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/operator/NDVI.scala
@@ -1,7 +1,7 @@
 package com.databricks.labs.mosaic.core.raster.operator
 
 import com.databricks.labs.mosaic.core.raster.MosaicRaster
-import com.databricks.labs.mosaic.core.raster.gdal_raster.MosaicRasterGDAL
+import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
 import com.databricks.labs.mosaic.utils.PathUtils
 
 object NDVI {

diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/operator/gdal/GDALBuildVRT.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/operator/gdal/GDALBuildVRT.scala
@@ -1,7 +1,8 @@
 package com.databricks.labs.mosaic.core.raster.operator.gdal
 
 import com.databricks.labs.mosaic.core.raster.MosaicRaster
-import com.databricks.labs.mosaic.core.raster.gdal_raster.{MosaicRasterGDAL, RasterCleaner}
+import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import org.gdal.gdal.{BuildVRTOptions, Dataset, WarpOptions, gdal}
 
 object GDALBuildVRT {

diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/operator/gdal/GDALTranslate.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/operator/gdal/GDALTranslate.scala
@@ -1,7 +1,7 @@
 package com.databricks.labs.mosaic.core.raster.operator.gdal
 
 import com.databricks.labs.mosaic.core.raster.MosaicRaster
-import com.databricks.labs.mosaic.core.raster.gdal_raster.MosaicRasterGDAL
+import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
 import org.gdal.gdal.{TranslateOptions, gdal}
 
 import java.nio.file.{Files, Paths}

diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/operator/gdal/GDALWarp.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/operator/gdal/GDALWarp.scala
@@ -1,7 +1,7 @@
 package com.databricks.labs.mosaic.core.raster.operator.gdal
 
 import com.databricks.labs.mosaic.core.raster.MosaicRaster
-import com.databricks.labs.mosaic.core.raster.gdal_raster.MosaicRasterGDAL
+import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
 import org.gdal.gdal.{WarpOptions, gdal}
 
 import java.nio.file.{Files, Paths}

diff --git a/.../raster/gdal_raster/RasterTransform.scala → .../operator/transform/RasterTransform.scala b/.../raster/gdal_raster/RasterTransform.scala → .../operator/transform/RasterTransform.scala
@@ -1,4 +1,4 @@
-package com.databricks.labs.mosaic.core.raster.gdal_raster
+package com.databricks.labs.mosaic.core.raster.operator.transform
 
 object RasterTransform {
 

diff --git a/src/main/scala/com/databricks/labs/mosaic/datasource/gdal/ReTileOnRead.scala b/src/main/scala/com/databricks/labs/mosaic/datasource/gdal/ReTileOnRead.scala
@@ -3,7 +3,8 @@ package com.databricks.labs.mosaic.datasource.gdal
 import com.databricks.labs.mosaic.core.index.{IndexSystem, IndexSystemFactory}
 import com.databricks.labs.mosaic.core.raster.MosaicRaster
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.{MosaicRasterGDAL, RasterCleaner}
+import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.raster.operator.retile.BalancedSubdivision
 import com.databricks.labs.mosaic.core.types.RasterTileType
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile

diff --git a/src/main/scala/com/databricks/labs/mosaic/datasource/gdal/ReadInMemory.scala b/src/main/scala/com/databricks/labs/mosaic/datasource/gdal/ReadInMemory.scala
@@ -2,7 +2,8 @@ package com.databricks.labs.mosaic.datasource.gdal
 
 import com.databricks.labs.mosaic.core.index.{IndexSystem, IndexSystemFactory}
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.{MosaicRasterGDAL, RasterCleaner}
+import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.RasterTileType
 import com.databricks.labs.mosaic.datasource.Utils
 import com.databricks.labs.mosaic.datasource.gdal.GDALFileFormat._

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/raster/RST_MergeAgg.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/raster/RST_MergeAgg.scala
@@ -2,7 +2,7 @@ package com.databricks.labs.mosaic.expressions.raster
 
 import com.databricks.labs.mosaic.core.index.IndexSystemFactory
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.raster.operator.merge.MergeRasters
 import com.databricks.labs.mosaic.core.types.RasterTileType
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/raster/RST_PixelHeight.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/raster/RST_PixelHeight.scala
@@ -1,6 +1,6 @@
 package com.databricks.labs.mosaic.expressions.raster
 
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.base.{GenericExpressionFactory, WithExpressionInfo}
 import com.databricks.labs.mosaic.expressions.raster.base.RasterExpression

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/raster/RST_PixelWidth.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/raster/RST_PixelWidth.scala
@@ -1,6 +1,6 @@
 package com.databricks.labs.mosaic.expressions.raster
 
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.base.{GenericExpressionFactory, WithExpressionInfo}
 import com.databricks.labs.mosaic.expressions.raster.base.RasterExpression

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/raster/RST_Tile.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/raster/RST_Tile.scala
@@ -3,7 +3,7 @@ package com.databricks.labs.mosaic.expressions.raster
 import com.databricks.labs.mosaic.core.geometry.api.GeometryAPI
 import com.databricks.labs.mosaic.core.index.{IndexSystem, IndexSystemFactory}
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.RasterTileType
 import com.databricks.labs.mosaic.datasource.gdal.ReTileOnRead
 import com.databricks.labs.mosaic.expressions.base.{GenericExpressionFactory, WithExpressionInfo}

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/raster/base/Raster1ArgExpression.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/raster/base/Raster1ArgExpression.scala
@@ -1,7 +1,7 @@
 package com.databricks.labs.mosaic.expressions.raster.base
 
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.base.GenericExpressionFactory
 import com.databricks.labs.mosaic.functions.MosaicExpressionConfig

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/raster/base/Raster2ArgExpression.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/raster/base/Raster2ArgExpression.scala
@@ -2,7 +2,7 @@ package com.databricks.labs.mosaic.expressions.raster.base
 
 import com.databricks.labs.mosaic.core.raster.MosaicRaster
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.base.GenericExpressionFactory
 import com.databricks.labs.mosaic.functions.MosaicExpressionConfig

diff --git a/...main/scala/com/databricks/labs/mosaic/expressions/raster/base/RasterArrayExpression.scala b/...main/scala/com/databricks/labs/mosaic/expressions/raster/base/RasterArrayExpression.scala
@@ -1,7 +1,7 @@
 package com.databricks.labs.mosaic.expressions.raster.base
 
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.base.GenericExpressionFactory
 import com.databricks.labs.mosaic.functions.MosaicExpressionConfig

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/raster/base/RasterBandExpression.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/raster/base/RasterBandExpression.scala
@@ -2,7 +2,7 @@ package com.databricks.labs.mosaic.expressions.raster.base
 
 import com.databricks.labs.mosaic.core.raster.MosaicRasterBand
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.base.GenericExpressionFactory
 import com.databricks.labs.mosaic.functions.MosaicExpressionConfig

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/raster/base/RasterExpression.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/raster/base/RasterExpression.scala
@@ -2,7 +2,7 @@ package com.databricks.labs.mosaic.expressions.raster.base
 
 import com.databricks.labs.mosaic.core.index.{IndexSystem, IndexSystemFactory}
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.base.GenericExpressionFactory
 import com.databricks.labs.mosaic.functions.MosaicExpressionConfig

diff --git a/...la/com/databricks/labs/mosaic/expressions/raster/base/RasterExpressionSerialization.scala b/...la/com/databricks/labs/mosaic/expressions/raster/base/RasterExpressionSerialization.scala
@@ -2,7 +2,7 @@ package com.databricks.labs.mosaic.expressions.raster.base
 
 import com.databricks.labs.mosaic.core.index.IndexSystemFactory
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.RasterTileType
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.functions.MosaicExpressionConfig

diff --git a/.../scala/com/databricks/labs/mosaic/expressions/raster/base/RasterGeneratorExpression.scala b/.../scala/com/databricks/labs/mosaic/expressions/raster/base/RasterGeneratorExpression.scala
@@ -3,7 +3,7 @@ package com.databricks.labs.mosaic.expressions.raster.base
 import com.databricks.labs.mosaic.core.geometry.api.GeometryAPI
 import com.databricks.labs.mosaic.core.index.{IndexSystem, IndexSystemFactory}
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.RasterTileType
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.base.GenericExpressionFactory

diff --git a/.../databricks/labs/mosaic/expressions/raster/base/RasterTessellateGeneratorExpression.scala b/.../databricks/labs/mosaic/expressions/raster/base/RasterTessellateGeneratorExpression.scala
@@ -3,7 +3,7 @@ package com.databricks.labs.mosaic.expressions.raster.base
 import com.databricks.labs.mosaic.core.geometry.api.GeometryAPI
 import com.databricks.labs.mosaic.core.index.{IndexSystem, IndexSystemFactory}
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.RasterTileType
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.base.GenericExpressionFactory

diff --git a/...ain/scala/com/databricks/labs/mosaic/expressions/raster/base/RasterToGridExpression.scala b/...ain/scala/com/databricks/labs/mosaic/expressions/raster/base/RasterToGridExpression.scala
@@ -2,7 +2,7 @@ package com.databricks.labs.mosaic.expressions.raster.base
 
 import com.databricks.labs.mosaic.core.geometry.api.GeometryAPI
 import com.databricks.labs.mosaic.core.index.{IndexSystem, IndexSystemFactory}
-import com.databricks.labs.mosaic.core.raster.gdal_raster.RasterCleaner
+import com.databricks.labs.mosaic.core.raster.io.RasterCleaner
 import com.databricks.labs.mosaic.core.types.model.MosaicRasterTile
 import com.databricks.labs.mosaic.expressions.raster.RasterToGridType
 import com.databricks.labs.mosaic.functions.MosaicExpressionConfig

diff --git a/src/main/scala/com/databricks/labs/mosaic/package.scala b/src/main/scala/com/databricks/labs/mosaic/package.scala
@@ -11,7 +11,7 @@ package object mosaic {
 
     val JTS: GeometryAPI = mosaic.core.geometry.api.JTS
     val ESRI: GeometryAPI = mosaic.core.geometry.api.ESRI
-    val GDAL: RasterAPI = mosaic.core.raster.api.RasterAPI.GDAL
+    val GDAL: RasterAPI = mosaic.core.raster.api.GDAL
     val H3: IndexSystem = mosaic.core.index.H3IndexSystem
     val BNG: IndexSystem = mosaic.core.index.BNGIndexSystem
 

diff --git a/src/main/scala/com/databricks/labs/mosaic/sql/extensions/MosaicSQL.scala b/src/main/scala/com/databricks/labs/mosaic/sql/extensions/MosaicSQL.scala
@@ -3,7 +3,7 @@ package com.databricks.labs.mosaic.sql.extensions
 import com.databricks.labs.mosaic._
 import com.databricks.labs.mosaic.core.geometry.api.{ESRI, JTS}
 import com.databricks.labs.mosaic.core.index.{BNGIndexSystem, H3IndexSystem}
-import com.databricks.labs.mosaic.core.raster.api.RasterAPI.GDAL
+import com.databricks.labs.mosaic.core.raster.api.GDAL
 import com.databricks.labs.mosaic.functions.MosaicContext
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.SparkSessionExtensions

diff --git a/src/main/scala/com/databricks/labs/mosaic/sql/extensions/MosaicSQLDefault.scala b/src/main/scala/com/databricks/labs/mosaic/sql/extensions/MosaicSQLDefault.scala
@@ -2,7 +2,7 @@ package com.databricks.labs.mosaic.sql.extensions
 
 import com.databricks.labs.mosaic.core.geometry.api.JTS
 import com.databricks.labs.mosaic.core.index.H3IndexSystem
-import com.databricks.labs.mosaic.core.raster.api.RasterAPI.GDAL
+import com.databricks.labs.mosaic.core.raster.api.GDAL
 import com.databricks.labs.mosaic.functions.MosaicContext
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.SparkSessionExtensions

diff --git a/src/test/scala/com/databricks/labs/mosaic/codegen/TestAsHexCodegen.scala b/src/test/scala/com/databricks/labs/mosaic/codegen/TestAsHexCodegen.scala
@@ -1,7 +1,7 @@
 package com.databricks.labs.mosaic.codegen
 
 import com.databricks.labs.mosaic.core.geometry.api.{ESRI, JTS}
-import com.databricks.labs.mosaic.core.raster.api.RasterAPI.GDAL
+import com.databricks.labs.mosaic.core.raster.api.GDAL
 import com.databricks.labs.mosaic.core.index.H3IndexSystem
 import com.databricks.labs.mosaic.functions.MosaicContext
 import com.databricks.labs.mosaic.test.SparkCodeGenSuite

diff --git a/src/test/scala/com/databricks/labs/mosaic/codegen/TestAsJSONCodegen.scala b/src/test/scala/com/databricks/labs/mosaic/codegen/TestAsJSONCodegen.scala
@@ -1,7 +1,7 @@
 package com.databricks.labs.mosaic.codegen
 
 import com.databricks.labs.mosaic.core.geometry.api.{JTS, ESRI}
-import com.databricks.labs.mosaic.core.raster.api.RasterAPI.GDAL
+import com.databricks.labs.mosaic.core.raster.api.GDAL
 import com.databricks.labs.mosaic.core.index.H3IndexSystem
 import com.databricks.labs.mosaic.functions.MosaicContext
 import com.databricks.labs.mosaic.test.SparkCodeGenSuite

diff --git a/src/test/scala/com/databricks/labs/mosaic/core/raster/TestRasterBandGDAL.scala b/src/test/scala/com/databricks/labs/mosaic/core/raster/TestRasterBandGDAL.scala
@@ -1,6 +1,6 @@
 package com.databricks.labs.mosaic.core.raster
 
-import com.databricks.labs.mosaic.core.raster.gdal_raster.MosaicRasterGDAL
+import com.databricks.labs.mosaic.core.raster.gdal.{MosaicRasterBandGDAL, MosaicRasterGDAL}
 import com.databricks.labs.mosaic.test.mocks.filePath
 import org.apache.spark.sql.test.SharedSparkSessionGDAL
 import org.scalatest.matchers.should.Matchers._

diff --git a/src/test/scala/com/databricks/labs/mosaic/core/raster/TestRasterGDAL.scala b/src/test/scala/com/databricks/labs/mosaic/core/raster/TestRasterGDAL.scala
@@ -2,7 +2,7 @@ package com.databricks.labs.mosaic.core.raster
 
 import com.databricks.labs.mosaic.core.raster.api.RasterAPI
 import com.databricks.labs.mosaic.GDAL
-import com.databricks.labs.mosaic.core.raster.gdal_raster.MosaicRasterGDAL
+import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
 import com.databricks.labs.mosaic.sql.extensions.MosaicGDAL
 import com.databricks.labs.mosaic.test.mocks.filePath
 import org.apache.spark.sql.test.SharedSparkSessionGDAL

diff --git a/src/test/scala/com/databricks/labs/mosaic/datasource/OGRFileFormatTest.scala b/src/test/scala/com/databricks/labs/mosaic/datasource/OGRFileFormatTest.scala
@@ -1,7 +1,7 @@
 package com.databricks.labs.mosaic.datasource
 
 import com.databricks.labs.mosaic.{H3, JTS}
-import com.databricks.labs.mosaic.core.raster.api.RasterAPI.GDAL
+import com.databricks.labs.mosaic.core.raster.api.GDAL
 import com.databricks.labs.mosaic.expressions.util.OGRReadeWithOffset
 import com.databricks.labs.mosaic.functions.MosaicContext
 import com.databricks.labs.mosaic.utils.PathUtils

diff --git a/src/test/scala/com/databricks/labs/mosaic/expressions/constructors/TestConstructors.scala b/src/test/scala/com/databricks/labs/mosaic/expressions/constructors/TestConstructors.scala
@@ -1,7 +1,7 @@
 package com.databricks.labs.mosaic.expressions.constructors
 
 import com.databricks.labs.mosaic.core.geometry.api.{ESRI, JTS}
-import com.databricks.labs.mosaic.core.raster.api.RasterAPI.GDAL
+import com.databricks.labs.mosaic.core.raster.api.GDAL
 import com.databricks.labs.mosaic.core.index.H3IndexSystem
 import com.databricks.labs.mosaic.functions.MosaicContext
 import com.databricks.labs.mosaic.test.SparkSuite

diff --git a/src/test/scala/com/databricks/labs/mosaic/sql/extensions/TestSQLExtensions.scala b/src/test/scala/com/databricks/labs/mosaic/sql/extensions/TestSQLExtensions.scala
@@ -3,7 +3,7 @@ package com.databricks.labs.mosaic.sql.extensions
 import com.databricks.labs.mosaic._
 import com.databricks.labs.mosaic.core.geometry.api.{ESRI, JTS}
 import com.databricks.labs.mosaic.core.index.{BNGIndexSystem, H3IndexSystem}
-import com.databricks.labs.mosaic.core.raster.api.RasterAPI.GDAL
+import com.databricks.labs.mosaic.core.raster.api.GDAL
 import com.databricks.labs.mosaic.functions.MosaicContext
 import com.databricks.labs.mosaic.test.SparkSuite
 import org.apache.spark.SparkConf