correct crs to determine spatial keys

Open-EO/openeo-geopyspark-driver#1146

Author: jdries

openeo-geotrellis/src/main/scala/org/openeo/geotrellis/layers/NetCDFCollection.scala

@@ -3,12 +3,12 @@ package org.openeo.geotrellis.layers
 import com.azavea.gdal.GDALWarp
 import geotrellis.layer.{KeyBounds, LayoutDefinition, Metadata, SpaceTimeKey, SpatialKey, TemporalKey, TemporalProjectedExtent, TileBounds, TileLayerMetadata}
 import geotrellis.proj4.LatLng
-import geotrellis.raster.{CellSize, MultibandTile, Raster, RasterExtent, Tile, TileLayout}
+import geotrellis.raster.{CellSize, IntCellType, MultibandTile, Raster, RasterExtent, Tile, TileLayout}
 import geotrellis.raster.gdal.{DefaultDomain, GDALException, GDALRasterSource, MalformedProjectionException}
 import geotrellis.spark.{ContextRDD, MultibandTileLayerRDD, withTilerMethods}
 import geotrellis.spark._
 import geotrellis.spark.partition.SpacePartitioner
-import geotrellis.vector.{Extent, ProjectedExtent}
+import geotrellis.vector._
 import org.apache.spark.{Partitioner, SparkContext}
 import org.apache.spark.rdd.RDD
 import org.openeo.geotrellis.ProjectedPolygons
@@ -107,7 +107,7 @@ object NetCDFCollection {
     val spatialBounds = KeyBounds(layout.mapTransform(extent))
     val temporalBounds = KeyBounds(SpaceTimeKey(spatialBounds.minKey,TemporalKey(LocalDate.of(1990,1,1).atStartOfDay(ZoneId.of("UTC")))),SpaceTimeKey(spatialBounds.maxKey,TemporalKey(LocalDate.now().atStartOfDay(ZoneId.of("UTC")))))
 
-    val keys: Array[SpatialKey] =  items.map(i => i.geometry.getOrElse(i.bbox.toPolygon())).clipToGrid(layout).map(_._1).distinct().collect()
+    val keys: Array[SpatialKey] =  items.map(i => i.geometry.getOrElse(i.bbox.toPolygon())).map(_.reproject(LatLng,crs(0))).clipToGrid(layout).map(_._1).distinct().collect()
     val partitioner: Partitioner = new SpacePartitioner(temporalBounds)(implicitly, implicitly, new ByTileSpacetimePartitioner(Some(keys)))
 
     val metadata = TileLayerMetadata[SpaceTimeKey](cellType, layout, extent, crs(0), temporalBounds)

openeo-geotrellis/src/test/scala/org/openeo/geotrellis/layers/NetCDFCollectionTest.scala

@@ -1,13 +1,16 @@
 package org.openeo.geotrellis.layers
 
 import com.azavea.gdal.GDALWarp
+import geotrellis.layer.SpaceTimeKey
 import geotrellis.proj4.{CRS, LatLng}
 import geotrellis.raster.{CellSize, RasterExtent, ShortConstantNoDataCellType, ShortUserDefinedNoDataCellType}
+import geotrellis.spark.partition.{SpacePartitioner, SpatialPartitioner}
 import geotrellis.spark.util.SparkUtils
 import geotrellis.vector.Extent
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue}
 import org.junit.jupiter.api.{AfterAll, Disabled, Test}
 import org.openeo.geotrellis.file.FixedFeaturesOpenSearchClient
+import org.openeo.geotrelliscommon.{ByTileSpacetimePartitioner, SpatialKeysProvider}
 import org.openeo.opensearch.OpenSearchResponses.{Feature, Link}
 
 import java.time.ZonedDateTime
@@ -52,6 +55,10 @@ class NetCDFCollectionTest {
     )
 
     val cube = NetCDFCollection.loadCollection(osClient, sc)
+
+    val index = cube.partitioner.get.asInstanceOf[SpacePartitioner[SpaceTimeKey]].index
+    assert(index.asInstanceOf[SpatialKeysProvider].spatialKeys.get.length > 100)
+
     assertEquals(2331,cube.count())
     assertEquals(Extent(603901.4819578232, 5656508.552285681, 653638.1910088382, 5687527.3439567955),cube.metadata.extent)
     assertEquals(crs,cube.metadata.crs)