From ae9b257ce0ac50dc4b960f89c967e25d628c35e0 Mon Sep 17 00:00:00 2001
From: Emile Sonneveld <emile.sonneveld@vito.be>
Date: Tue, 27 Feb 2024 15:35:38 +0100
Subject: [PATCH] Multiple samples per day for tiff.
 https://github.com/Open-EO/openeo-geotrellis-extensions/pull/268

---
 .../openeo/geotrellis/geotiff/package.scala   | 36 +++++++++++++++++--
 .../geotiff/WriteRDDToGeotiffTest.scala       |  3 +-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/package.scala b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/package.scala
index 0ab73d2ef..63a9def64 100644
--- a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/package.scala
+++ b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/geotiff/package.scala
@@ -23,6 +23,7 @@ import org.apache.spark.storage.StorageLevel
 import org.apache.spark.util.AccumulatorV2
 import org.openeo.geotrellis
 import org.openeo.geotrellis.creo.CreoS3Utils
+import org.openeo.geotrellis.netcdf.NetCDFRDDWriter.fixedTimeOffset
 import org.openeo.geotrellis.stac.STACItem
 import org.openeo.geotrellis.tile_grid.TileGrid
 import org.slf4j.LoggerFactory
@@ -32,6 +33,7 @@ import spire.math.Integral
 import spire.syntax.cfor.cfor
 
 import java.nio.file.{Path, Paths}
+import java.time.Duration
 import java.time.format.DateTimeFormatter
 import java.util.{ArrayList, Collections, Map, List => JList}
 import scala.collection.JavaConverters._
@@ -41,6 +43,8 @@ package object geotiff {
 
   private val logger = LoggerFactory.getLogger(getClass)
 
+  val secondsPerDay = 86400L
+
   class SetAccumulator[T](var value: Set[T]) extends AccumulatorV2[T, Set[T]] {
     def this() = this(Set.empty[T])
     override def isZero: Boolean = value.isEmpty
@@ -95,6 +99,14 @@ package object geotiff {
     val croppedExtent: Extent = preProcessResult._2
     val preprocessedRdd: RDD[(SpaceTimeKey, MultibandTile)] with Metadata[TileLayerMetadata[SpaceTimeKey]] = preProcessResult._3
 
+    val temporalResolution = if (preprocessedRdd.keys.filter({
+      case key: SpaceTimeKey =>
+        // true if not exactly n days:
+        Duration.between(fixedTimeOffset, key.time).getSeconds % secondsPerDay != 0
+      case _ =>
+        false
+    }).isEmpty()) TemporalResolution.days else TemporalResolution.seconds
+
     val tileLayout = preprocessedRdd.metadata.tileLayout
 
     val totalCols = math.ceil(gridBounds.width.toDouble / tileLayout.tileCols).toInt
@@ -124,7 +136,13 @@ package object geotiff {
           (index, (multibandTile.cellType, compressedBytes))
       })
     }.map(tuple => {
-      val filename = s"${formatOptions.filenamePrefix}_${DateTimeFormatter.ISO_DATE.format(tuple._1.time)}.tif"
+      val filename = temporalResolution match {
+        case TemporalResolution.days =>
+          s"${formatOptions.filenamePrefix}_${DateTimeFormatter.ISO_DATE.format(tuple._1.time)}.tif"
+        case TemporalResolution.seconds =>
+          // ':' is not valid in a Windows filename
+          s"${formatOptions.filenamePrefix}_${DateTimeFormatter.ISO_ZONED_DATE_TIME.format(tuple._1.time).replace(":", "-")}.tif"
+      }
       val timestamp = tuple._1.time format DateTimeFormatter.ISO_ZONED_DATE_TIME
       ((filename, timestamp), tuple._2)
     }).groupByKey().map((tuple: ((String, String), Iterable[Vector[(Int, (CellType, Array[Byte]))]])) => {
@@ -682,6 +700,14 @@ package object geotiff {
     val layout = rdd.metadata.layout
     val crs = rdd.metadata.crs
 
+    val temporalResolution = if (rdd.keys.filter({
+      case key: SpaceTimeKey =>
+        // true if not exactly n days:
+        Duration.between(fixedTimeOffset, key.time).getSeconds % secondsPerDay != 0
+      case _ =>
+        false
+    }).isEmpty()) TemporalResolution.days else TemporalResolution.seconds
+
     rdd
       .flatMap { case (key, tile) => featuresBC.value
         .filter { case (_, geometry) => layout.mapTransform.keysForGeometry(geometry) contains key.spatialKey }
@@ -689,7 +715,13 @@ package object geotiff {
       }
       .groupByKey()
       .map { case ((name, (geometry, time)), tiles) =>
-        val filename = s"${filenamePrefix.getOrElse("openEO")}_${DateTimeFormatter.ISO_DATE.format(time)}_$name.tif"
+        val filename = temporalResolution match {
+          case TemporalResolution.days =>
+            s"${filenamePrefix.getOrElse("openEO")}_${DateTimeFormatter.ISO_DATE.format(time)}_$name.tif"
+          case TemporalResolution.seconds =>
+            // ':' is not valid in a Windows filename
+            s"${filenamePrefix.getOrElse("openEO")}_${DateTimeFormatter.ISO_ZONED_DATE_TIME.format(time).replace(":", "-")}_$name.tif"
+        }
         val filePath = Paths.get(path).resolve(filename).toString
         val timestamp = time format DateTimeFormatter.ISO_ZONED_DATE_TIME
         (stitchAndWriteToTiff(tiles, filePath, layout, crs, geometry, croppedExtent, cropDimensions, compression),
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
index a52367476..0a6dee9b9 100644
--- a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/WriteRDDToGeotiffTest.scala
+++ b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/geotiff/WriteRDDToGeotiffTest.scala
@@ -315,7 +315,6 @@ class WriteRDDToGeotiffTest {
     assertArrayEquals(croppedReference.toArray(), result2.band(0).toArrayTile().crop(2 * 256, 0, layoutCols * 256, layoutRows * 256).toArray())
   }
 
-  @Ignore("Fix this test: https://github.com/Open-EO/openeo-geotrellis-extensions/issues/257")
   @Test
   def testWriteMultibandTemporalHourlyRDDWithGaps(): Unit = {
     val layoutCols = 8
@@ -392,7 +391,7 @@ class WriteRDDToGeotiffTest {
 
     val ret = saveSamples(tileLayerRDD, outDir.toString, tiltedRectangle, sampleNames,
       DeflateCompression(BEST_COMPRESSION))
-    assertTrue(ret.get(0)._2.contains("T"))
+    assertTrue(ret.get(0)._1.contains("T"))
   }
 
   @Test