From 8de9748b06cb0923f58150461f9fc92a169d920e Mon Sep 17 00:00:00 2001 From: Jeroen Dries Date: Wed, 16 Oct 2024 08:10:25 +0200 Subject: [PATCH 1/5] geotrellis upgrade to next stable version --- geotrellis-accumulo-extensions/pom.xml | 6 ------ geotrellis-sentinelhub/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/geotrellis-accumulo-extensions/pom.xml b/geotrellis-accumulo-extensions/pom.xml index 0761ec2d..0a2e3c64 100644 --- a/geotrellis-accumulo-extensions/pom.xml +++ b/geotrellis-accumulo-extensions/pom.xml @@ -25,12 +25,6 @@ - - - org.typelevel - cats-kernel_${scala.binary.version} - 2.4.2 - org.openeo geotrellis-common diff --git a/geotrellis-sentinelhub/pom.xml b/geotrellis-sentinelhub/pom.xml index e49384a8..a84dbb8a 100644 --- a/geotrellis-sentinelhub/pom.xml +++ b/geotrellis-sentinelhub/pom.xml @@ -15,7 +15,7 @@ org.typelevel cats-kernel_${scala.binary.version} - 2.4.2 + 2.7.0 org.openeo diff --git a/pom.xml b/pom.xml index 7fa2cc1b..f29c2f19 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ pom openeo-geotrellis-extensions - 21.2 + 25.0 3.1.1 1.7.7 3.4.2 2.12 2.12.18 - 3.6.0 + 3.7.1 3.8.0 1.10 0.17.0_2.12-SNAPSHOT From e399e5fdf0faa2ed168911ff1a9535998943e502 Mon Sep 17 00:00:00 2001 From: Jeroen Dries Date: Wed, 16 Oct 2024 08:46:16 +0200 Subject: [PATCH 2/5] geotrellis upgrade to 3.7.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f29c2f19..183f0415 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 3.8.0 1.10 0.17.0_2.12-SNAPSHOT - 1.4.0_2.12-SNAPSHOT + 1.5.0_2.12-SNAPSHOT 2.21.26 2.3.0 UTF-8 From b7bd318f54d0e2fe08459d62b8efbcca0b8701ec Mon Sep 17 00:00:00 2001 From: Jeroen Dries Date: Wed, 16 Oct 2024 10:13:25 +0200 Subject: [PATCH 3/5] try more recent cats --- geotrellis-sentinelhub/pom.xml | 2 +- .../scala/org/openeo/geotrellis/netcdf/NetCDFRDDWriter.scala | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/geotrellis-sentinelhub/pom.xml b/geotrellis-sentinelhub/pom.xml index a84dbb8a..1ad32686 100644 --- a/geotrellis-sentinelhub/pom.xml +++ b/geotrellis-sentinelhub/pom.xml @@ -15,7 +15,7 @@ org.typelevel cats-kernel_${scala.binary.version} - 2.7.0 + 2.10.0 org.openeo 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 index 8fd1c9f3..11f04378 100644 --- a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/netcdf/NetCDFRDDWriter.scala +++ b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/netcdf/NetCDFRDDWriter.scala @@ -24,7 +24,7 @@ import software.amazon.awssdk.core.sync.RequestBody import software.amazon.awssdk.services.s3.model.PutObjectRequest import software.amazon.awssdk.transfer.s3.S3TransferManager import software.amazon.awssdk.transfer.s3.model.UploadFileRequest -import ucar.ma2.{ArrayDouble, ArrayInt, DataType} +import ucar.ma2.{ArrayDouble, ArrayInt, DataType, InvalidRangeException} import ucar.nc2.write.Nc4ChunkingDefault import ucar.nc2.{Attribute, Dimension, NetcdfFileWriter, Variable} @@ -759,7 +759,6 @@ object NetCDFRDDWriter { if (coordinates != null) netcdfFile.addVariableAttribute(variableName, "coordinates", coordinates) } - import org.opengis.coverage.grid.InvalidRangeException @throws[IOException] @throws[InvalidRangeException] From 66e4b1498816d68e0adaed228e7f5be2736bf303 Mon Sep 17 00:00:00 2001 From: Jeroen Dries Date: Thu, 17 Oct 2024 15:02:41 +0200 Subject: [PATCH 4/5] updated ref file --- openeo-geotrellis/pom.xml | 2 ++ .../test/scala/org/openeo/geotrellis/OpenEOProcessesSpec.scala | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openeo-geotrellis/pom.xml b/openeo-geotrellis/pom.xml index 6cfd0590..a05d9d89 100644 --- a/openeo-geotrellis/pom.xml +++ b/openeo-geotrellis/pom.xml @@ -286,7 +286,9 @@ ../venv/bin:${env.PATH} /tmp_epod/gdal:../venv/lib/python3.8/site-packages/jep /tmp_epod/gdal/data + 127.0.0.1 + --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.security.action=ALL-UNNAMED software.amazon.awssdk.http.apache.ApacheSdkHttpService diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/OpenEOProcessesSpec.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/OpenEOProcessesSpec.scala index e291645b..6548ad3c 100644 --- a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/OpenEOProcessesSpec.scala +++ b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/OpenEOProcessesSpec.scala @@ -396,7 +396,7 @@ class OpenEOProcessesSpec extends RasterMatchers { // Compare to reference tile. saveRDD(resultCube.toSpatial(times.head),2, "groupByGeometry_2017-01-15_actual.tif", 6, Some(datacube.metadata.extent)) val actualRaster = GeoTiffRasterSource("groupByGeometry_2017-01-15_actual.tif").read().get - val referenceRaster = GeoTiffRasterSource("https://artifactory.vgt.vito.be/artifactory/testdata-public/groupByGeometry_2017-01-15_reference.tif").read().get + val referenceRaster = GeoTiffRasterSource("https://artifactory.vgt.vito.be/artifactory/testdata-public/openeo/geotrellis_extrensions/testGroupAndMaskByGeometry.tif").read().get assertRastersEqual(referenceRaster, actualRaster) // Visualize RDD. From 92561f6ee97617f2777d274c7f2b1dcf6bda283a Mon Sep 17 00:00:00 2001 From: Jeroen Dries Date: Thu, 17 Oct 2024 15:27:47 +0200 Subject: [PATCH 5/5] agera fix --- .../geotrellis/layers/AgEra5FileLayerProviderTest.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/layers/AgEra5FileLayerProviderTest.scala b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/layers/AgEra5FileLayerProviderTest.scala index 879e5f8a..c00979b7 100644 --- a/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/layers/AgEra5FileLayerProviderTest.scala +++ b/openeo-geotrellis/src/test/scala/org/openeo/geotrellis/layers/AgEra5FileLayerProviderTest.scala @@ -59,8 +59,8 @@ class AgEra5FileLayerProviderTest { assertEquals(27902.167,histogram(0).mean().get,1.0) assertEquals(0.247,histogram(1).mean().get,0.01) - assertEquals(11414687,histogram(2).mean().get,1.0) - assertEquals(1158,histogram(0).totalCount()) + assertEquals(11413342,histogram(2).mean().get,1.0) + assertEquals(1157,histogram(0).totalCount()) assertEquals(1224,histogram(1).totalCount()) assertEquals(2500,histogram(2).totalCount()) @@ -72,7 +72,7 @@ class AgEra5FileLayerProviderTest { } @Test - def agEra5WithOpensearchClient(): Unit = { + def agEra5UTM(): Unit = { val utm31 = CRS.fromEpsgCode(32631) val projectedExtent = ProjectedExtent(ProjectedExtent(extent, LatLng).reproject(utm31),utm31) val projectedPolygons = ProjectedPolygons.fromExtent(projectedExtent.extent, s"EPSG:${projectedExtent.crs.epsgCode.get}")