#349 rename geotiff 'package' to SaveResultAsGeotiff

Open-EO · Jan 3, 2025 · e24d8e9 · e24d8e9
1 parent 8cd6b37
commit e24d8e9
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 28 deletions.
diff --git a/geotrellis-extensions/src/test/scala/org/openeo/extensions/PyramidFactoryTest.scala b/geotrellis-extensions/src/test/scala/org/openeo/extensions/PyramidFactoryTest.scala
@@ -61,7 +61,7 @@ class PyramidFactoryTest {
           .toSpatial()
           .cache()
 
-        val paths = org.openeo.geotrellis.geotiff.saveRDD(
+        val paths = org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.saveRDD(
           rdd = spatialLayer,
           bandCount = 2,
           path = "/tmp/sentinalHubSmallAreaToTiff.gtiff",

diff --git a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/GTiffOptions.scala b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/GTiffOptions.scala
@@ -3,6 +3,7 @@ package org.openeo.geotrellis.geotiff
 import java.util
 import geotrellis.raster.io.geotiff.Tags
 import geotrellis.raster.render.{ColorMap, DoubleColorMap, IndexedColorMap}
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.assertSafeToUseInFilePath
 
 import scala.collection.JavaConverters._
 

diff --git a/...g/openeo/geotrellis/geotiff/package.scala → ...trellis/geotiff/SaveResultAsGeotiff.scala b/...g/openeo/geotrellis/geotiff/package.scala → ...trellis/geotiff/SaveResultAsGeotiff.scala
@@ -1,4 +1,4 @@
-package org.openeo.geotrellis
+package org.openeo.geotrellis.geotiff
 
 import geotrellis.layer._
 import geotrellis.proj4.CRS
@@ -22,6 +22,7 @@ import org.apache.spark.rdd.RDD
 import org.apache.spark.storage.StorageLevel
 import org.apache.spark.util.AccumulatorV2
 import org.openeo.geotrellis
+import org.openeo.geotrellis.{OpenEOProcesses, ProjectedPolygons, SimpleJson, getTempFile}
 import org.openeo.geotrellis.creo.CreoS3Utils
 import org.openeo.geotrellis.netcdf.NetCDFRDDWriter.fixedTimeOffset
 import org.openeo.geotrellis.stac.STACItem
@@ -38,7 +39,7 @@ import java.util.{ArrayList, Collections, Map, List => JList}
 import scala.collection.JavaConverters._
 import scala.reflect._
 
-package object geotiff {
+object SaveResultAsGeotiff {
 
   private val logger = LoggerFactory.getLogger(getClass)
   private val secondsPerDay = 86400L
@@ -896,14 +897,14 @@ package object geotiff {
                                    compression: Compression,
                                    filenamePrefix: Option[String],
                                   ): java.util.List[(String, String, Extent)] =
-    geotrellis.geotiff.saveStitchedTileGridTemporal(rdd, path, tileGrid, Option.empty, Option.empty, compression, filenamePrefix)
+    SaveResultAsGeotiff.saveStitchedTileGridTemporal(rdd, path, tileGrid, Option.empty, Option.empty, compression, filenamePrefix)
 
   def saveStitchedTileGridTemporal(rdd: MultibandTileLayerRDD[SpaceTimeKey],
                                    path: String,
                                    tileGrid: String,
                                    compression: Compression,
                                   ): java.util.List[(String, String, Extent)] =
-    geotrellis.geotiff.saveStitchedTileGridTemporal(rdd, path, tileGrid, Option.empty, Option.empty, compression)
+    SaveResultAsGeotiff.saveStitchedTileGridTemporal(rdd, path, tileGrid, Option.empty, Option.empty, compression)
 
   def saveStitchedTileGridTemporal(rdd: MultibandTileLayerRDD[SpaceTimeKey],
                                    path: String,

diff --git a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/netcdf/NetCDFRDDWriter.scala b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/netcdf/NetCDFRDDWriter.scala
@@ -16,7 +16,7 @@ import org.apache.spark.broadcast.Broadcast
 import org.apache.spark.rdd.RDD
 import org.apache.spark.storage.StorageLevel
 import org.openeo.geotrellis.creo.CreoS3Utils
-import org.openeo.geotrellis.geotiff.preProcess
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.preProcess
 import org.openeo.geotrellis.{OpenEOProcesses, ProjectedPolygons, TemporalResolution}
 import org.openeo.geotrelliscommon.ByKeyPartitioner
 import org.slf4j.LoggerFactory

diff --git a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/png/package.scala b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/png/package.scala
@@ -7,7 +7,7 @@ import geotrellis.raster.{MultibandTile, UByteCellType}
 import geotrellis.spark._
 import geotrellis.vector.{Extent, ProjectedExtent}
 import org.openeo.geotrellis.creo.CreoS3Utils.uploadToS3
-import org.openeo.geotrellis.geotiff.SRDD
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.SRDD
 
 import java.io.File
 import java.nio.file.{Files, Paths}

diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/MergeCubesSpec.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/MergeCubesSpec.scala
@@ -1,6 +1,6 @@
 package org.openeo.geotrellis
 
-import geotrellis.layer.{SpaceTimeKey, _}
+import geotrellis.layer._
 import geotrellis.proj4.CRS
 import geotrellis.raster._
 import geotrellis.spark._
@@ -12,7 +12,7 @@ import org.junit.jupiter.api.{AfterAll, BeforeAll, Test}
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.{Arguments, MethodSource}
 import org.openeo.geotrellis.LayerFixtures._
-import org.openeo.geotrellis.geotiff.saveRDD
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.saveRDD
 import org.openeo.geotrelliscommon.{OpenEORasterCube, OpenEORasterCubeMetadata, SparseSpaceTimePartitioner}
 
 import java.nio.file.{Files, Paths}

diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/OpenEOProcessesSpec.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/OpenEOProcessesSpec.scala
@@ -30,7 +30,7 @@ import org.openeo.geotrellis.LayerFixtures._
 import org.openeo.geotrellis.aggregate_polygon.intern.splitOverlappingPolygons
 import org.openeo.geotrellis.aggregate_polygon.{AggregatePolygonProcess, SparkAggregateScriptBuilder}
 import org.openeo.geotrellis.file.Sentinel2RadiometryPyramidFactory
-import org.openeo.geotrellis.geotiff.{ContextSeq, saveRDD}
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.{ContextSeq, saveRDD}
 import org.openeo.geotrelliscommon.SparseSpaceOnlyPartitioner
 import org.openeo.sparklisteners.GetInfoSparkListener
 

diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/PackageTest.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/PackageTest.scala
@@ -4,7 +4,7 @@ import geotrellis.raster.io.geotiff.GeoTiff
 import geotrellis.raster.{ByteCellType, ByteUserDefinedNoDataCellType, FloatUserDefinedNoDataCellType, UByteCellType, UByteUserDefinedNoDataCellType}
 import org.junit.Assert._
 import org.junit.Test
-import org.openeo.geotrellis.geotiff._
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff._
 
 import java.nio.file.{Files, Path}
 

diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/TestImplicits.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/TestImplicits.scala
@@ -31,7 +31,7 @@ object TestImplicits {
   implicit class MultibandTileGeoTiffOutputMethods(spatialLayer: MultibandTileLayerRDD[SpatialKey]) {
     def writeGeoTiff(path: String, bbox: ProjectedExtent = null): Unit = {
       val maybeBBox = Option(bbox).map(_.reproject(spatialLayer.metadata.crs))
-      org.openeo.geotrellis.geotiff.saveRDD(spatialLayer, -1, path, 6, maybeBBox)
+      org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.saveRDD(spatialLayer, -1, path, 6, maybeBBox)
     }
   }
 }
diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/file/CglsPyramidFactoryTest.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/file/CglsPyramidFactoryTest.scala
@@ -16,7 +16,7 @@ import org.junit.Assert.assertEquals
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import org.junit.{AfterClass, Ignore, Test}
 import org.openeo.geotrellis.TestImplicits._
-import org.openeo.geotrellis.geotiff._
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff._
 import org.openeo.geotrellis.{LayerFixtures, LocalSparkContext, ProjectedPolygons}
 import org.openeo.geotrelliscommon.DataCubeParameters
 import org.openeo.opensearch.OpenSearchClient

diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/file/ProbaVPyramidFactoryTest.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/file/ProbaVPyramidFactoryTest.scala
@@ -98,7 +98,7 @@ class ProbaVPyramidFactoryTest extends RasterMatchers {
     assertTrue(baseLayer.partitioner.get.isInstanceOf[SpacePartitioner[SpaceTimeKey]])
     println(s"got ${baseLayer.count()} tiles")
     val cropBounds = boundingBox.reproject(baseLayer.metadata.crs)
-    val timestampedFiles = org.openeo.geotrellis.geotiff.saveRDDTemporal(baseLayer,"./",cropBounds = Some(cropBounds))
+    val timestampedFiles = org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.saveRDDTemporal(baseLayer,"./",cropBounds = Some(cropBounds))
     assertEquals(1, timestampedFiles.size())
     val (fileName, timestamp, bbox) = timestampedFiles.get(0)
     assertEquals("2019-08-01T00:00:00Z", timestamp)
@@ -131,7 +131,7 @@ class ProbaVPyramidFactoryTest extends RasterMatchers {
     assertTrue(baseLayer.partitioner.get.isInstanceOf[SpacePartitioner[SpaceTimeKey]])
     println(s"got ${baseLayer.count()} tiles")
     val cropBounds = boundingBox.reproject(baseLayer.metadata.crs)
-    val timestampedFiles = org.openeo.geotrellis.geotiff.saveRDDTemporal(baseLayer,outDir.toString,cropBounds = Some(cropBounds))
+    val timestampedFiles = org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.saveRDDTemporal(baseLayer,outDir.toString,cropBounds = Some(cropBounds))
     assertEquals(1, timestampedFiles.size())
     val (fileName, timestamp, bbox) = timestampedFiles.get(0)
     assertEquals("2019-08-01T00:00:00Z", timestamp)

diff --git a/...eo-geotrellis/src/test/scala/org/openeo/geotrellis/file/Sentinel2PyramidFactoryTest.scala b/...eo-geotrellis/src/test/scala/org/openeo/geotrellis/file/Sentinel2PyramidFactoryTest.scala
@@ -18,7 +18,7 @@ import org.junit.Assert._
 import org.junit.{AfterClass, BeforeClass, Test}
 import org.openeo.geotrellis.ProjectedPolygons
 import org.openeo.geotrellis.TestImplicits._
-import org.openeo.geotrellis.geotiff.saveRDD
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.saveRDD
 import org.openeo.geotrelliscommon.DataCubeParameters
 import org.openeo.opensearch.OpenSearchClient
 import org.openeo.opensearch.backends.GeotiffNoDateSearchClient

diff --git a/...eo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/AgEra5PyramidFactoryTest.scala b/...eo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/AgEra5PyramidFactoryTest.scala
@@ -1,4 +1,4 @@
-package org.openeo.geotrellis.geotiff
+package org.openeo.geotrellis.SaveResultAsGeotiff
 
 import cats.data.NonEmptyList
 import geotrellis.layer.{SpaceTimeKey, TemporalKeyExtractor, ZoomedLayoutScheme}

diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/PackageTest.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/PackageTest.scala
@@ -4,6 +4,7 @@ import geotrellis.raster.io.geotiff.MultibandGeoTiff
 import org.junit.jupiter.api.Assertions.{assertEquals, assertThrows, assertTrue}
 import org.junit.jupiter.api.{Disabled, Test}
 import org.junit.jupiter.api.io.TempDir
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.embedGdalMetadata
 
 import java.io.IOException
 import java.nio.file.{Files, Path, Paths}

diff --git a/...-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/RasterRegionPyramidFactory.scala b/...-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/RasterRegionPyramidFactory.scala
@@ -1,4 +1,4 @@
-package org.openeo.geotrellis.geotiff
+package org.openeo.geotrellis.SaveResultAsGeotiff
 
 import java.time.{LocalDate, LocalTime, ZoneOffset, ZonedDateTime}
 

diff --git a/...trellis/src/test/scala/org/openeo/geotrellis/geotiff/RasterRegionPyramidFactoryTest.scala b/...trellis/src/test/scala/org/openeo/geotrellis/geotiff/RasterRegionPyramidFactoryTest.scala
@@ -1,4 +1,4 @@
-package org.openeo.geotrellis.geotiff
+package org.openeo.geotrellis.SaveResultAsGeotiff
 
 import geotrellis.layer._
 import geotrellis.raster.Raster

diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/TileGridTest.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/TileGridTest.scala
@@ -11,9 +11,10 @@ import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.api.{BeforeAll, Test}
 import org.junit.{AfterClass, Assert}
 import org.openeo.geotrellis.LayerFixtures.rgbLayerProvider
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.saveRDDTileGrid
 import org.openeo.geotrellis.png.PngTest
 import org.openeo.geotrellis.tile_grid.TileGrid
-import org.openeo.geotrellis.{LayerFixtures, geotiff}
+import org.openeo.geotrellis.LayerFixtures
 
 import java.nio.file.Path
 import java.time.LocalTime.MIDNIGHT
@@ -60,7 +61,7 @@ class TileGridTest {
       .toSpatial()
       .persist(DISK_ONLY)
 
-    val tiles = geotiff.saveStitchedTileGrid(spatialLayer, outDir + "/testSaveStitched.tiff", "10km", DeflateCompression(6))
+    val tiles = SaveResultAsGeotiff.saveStitchedTileGrid(spatialLayer, outDir + "/testSaveStitched.tiff", "10km", DeflateCompression(6))
     val expectedPaths = Set(
       outDir + "/testSaveStitched-31UDS_3_4.tiff",
       outDir + "/testSaveStitched-31UDS_2_4.tiff",
@@ -74,7 +75,7 @@ class TileGridTest {
     val extent = bbox.reproject(spatialLayer.metadata.crs)
     val cropBounds = mapAsJavaMap(Map("xmin" -> extent.xmin, "xmax" -> extent.xmax, "ymin" -> extent.ymin, "ymax" -> extent.ymax))
 
-    val croppedTiles = geotiff.saveStitchedTileGrid(spatialLayer, outDir + "/testSaveStitched_cropped.tiff", "10km", cropBounds, DeflateCompression(6))
+    val croppedTiles = SaveResultAsGeotiff.saveStitchedTileGrid(spatialLayer, outDir + "/testSaveStitched_cropped.tiff", "10km", cropBounds, DeflateCompression(6))
     val expectedCroppedPaths = Set(
       outDir + "/testSaveStitched_cropped-31UDS_3_4.tiff",
       outDir + "/testSaveStitched_cropped-31UDS_2_4.tiff",
@@ -138,7 +139,7 @@ class TileGridTest {
 
     val layer = LayerFixtures.sentinel2TocLayerProviderUTM.readMultibandTileLayer(from = date, to = date, bbox, sc = sc)
 
-    val tiles = geotiff.saveStitchedTileGridTemporal(layer, "/tmp/", "10km", DeflateCompression(6))
+    val tiles = SaveResultAsGeotiff.saveStitchedTileGridTemporal(layer, "/tmp/", "10km", DeflateCompression(6))
     val expectedTiles = Set(
       ("/tmp/openEO_2020-04-05Z_31UDS_3_4.tif", isoFormattedDate),
       ("/tmp/openEO_2020-04-05Z_31UDS_2_4.tif", isoFormattedDate),
@@ -158,7 +159,7 @@ class TileGridTest {
 
     val layer = LayerFixtures.sentinel2TocLayerProviderUTM.readMultibandTileLayer(from = date, to = date, bbox, sc = sc)
 
-    val tiles = geotiff.saveStitchedTileGridTemporal(layer, "/tmp/", "10km", DeflateCompression(6), filenamePrefix = Some("testPrefix"))
+    val tiles = SaveResultAsGeotiff.saveStitchedTileGridTemporal(layer, "/tmp/", "10km", DeflateCompression(6), filenamePrefix = Some("testPrefix"))
     val expectedTiles = Set(
       ("/tmp/testPrefix_2020-04-05Z_31UDS_3_4.tif", isoFormattedDate),
       ("/tmp/testPrefix_2020-04-05Z_31UDS_2_4.tif", isoFormattedDate),

diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/WriteRDDToGeotiffTest.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/WriteRDDToGeotiffTest.scala
@@ -18,6 +18,7 @@ import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.api.{BeforeAll, Test}
 import org.junit.rules.TemporaryFolder
 import org.junit.{AfterClass, Rule}
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.{GDALINFO_SUFFIX, saveRDD, saveRDDTemporal, saveSamples}
 import org.openeo.geotrellis.{LayerFixtures, OpenEOProcesses, ProjectedPolygons}
 import org.slf4j.{Logger, LoggerFactory}
 

diff --git a/...geotrellis/src/test/scala/org/openeo/geotrellis/layers/LoadCollectionFromAssetsTest.scala b/...geotrellis/src/test/scala/org/openeo/geotrellis/layers/LoadCollectionFromAssetsTest.scala
@@ -24,7 +24,8 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 import org.openeo.geotrellis.TestImplicits._
 import org.openeo.geotrellis.file.PyramidFactory
-import org.openeo.geotrellis.geotiff._
+import org.openeo.geotrellis.geotiff.GTiffOptions
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff._
 import org.openeo.geotrellis.layers.LoadCollectionFromAssets.rasterSourceRDD
 import org.openeo.geotrellis.netcdf.{NetCDFOptions, NetCDFRDDWriter}
 import org.openeo.geotrellis.{LayerFixtures, ProjectedPolygons}

diff --git a/...s/src/test/scala/org/openeo/geotrellis/layers/Sentinel2LoadCollectionFromAssetsTest.scala b/...s/src/test/scala/org/openeo/geotrellis/layers/Sentinel2LoadCollectionFromAssetsTest.scala
@@ -28,10 +28,11 @@ import org.junit.jupiter.params.provider.Arguments.arguments
 import org.junit.jupiter.params.provider.{Arguments, MethodSource}
 import org.junit.{AfterClass, BeforeClass}
 import org.openeo.geotrellis.TestImplicits._
-import org.openeo.geotrellis.geotiff.{GTiffOptions, saveRDD}
+import org.openeo.geotrellis.geotiff.GTiffOptions
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.saveRDD
 import org.openeo.geotrellis.netcdf.{NetCDFOptions, NetCDFRDDWriter}
 import org.openeo.geotrellis.{LayerFixtures, MergeCubesSpec, OpenEOProcessScriptBuilder, OpenEOProcesses, ProjectedPolygons, TestOpenEOProcessScriptBuilder}
-import org.openeo.geotrelliscommon.{BatchJobMetadataTracker, ConfigurableSpaceTimePartitioner, SparseSpaceTimePartitioner, DataCubeParameters, ResampledTile}
+import org.openeo.geotrelliscommon.{BatchJobMetadataTracker, ConfigurableSpaceTimePartitioner, DataCubeParameters, ResampledTile, SparseSpaceTimePartitioner}
 import org.openeo.opensearch.OpenSearchResponses.Link
 import org.openeo.opensearch.{OpenSearchClient, OpenSearchResponses}
 import org.openeo.sparklisteners.GetInfoSparkListener

diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/udf/UdfTest.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/udf/UdfTest.scala
@@ -12,7 +12,7 @@ import org.apache.spark.rdd.RDD
 import org.apache.spark.{SparkConf, SparkContext}
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.{AfterAll, BeforeAll, Test}
-import org.openeo.geotrellis.geotiff.saveRDD
+import org.openeo.geotrellis.geotiff.SaveResultAsGeotiff.saveRDD
 import org.openeo.geotrellis.{OpenEOProcesses, ProjectedPolygons}
 
 import java.time.ZonedDateTime