Merge pull request #290 from Open-EO/missing_products_20240513

Missing products
Open-EO · May 20, 2024 · 7d56749 · 7d56749
2 parents 89d124d + fd8f768
commit 7d56749
Show file tree

Hide file tree

Showing 5 changed files with 799 additions and 7 deletions.
diff --git a/geopyspark-geotrellis/pom.xml b/geopyspark-geotrellis/pom.xml
@@ -190,6 +190,7 @@
                             <type>scalapb</type>
                             <outputOptions>grpc</outputOptions> <!-- more scalapb options can be added here -->
                             <pluginArtifact>com.thesamet.scalapb:protoc-gen-scala:0.9.6:sh:unix</pluginArtifact>
+                            <!--<pluginArtifact>com.thesamet.scalapb:protoc-gen-scala:0.9.6:bat:windows</pluginArtifact>-->
                         </outputTarget>
                     </outputTargets>
                 </configuration>

diff --git a/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/layers/FileLayerProvider.scala b/openeo-geotrellis/src/main/scala/org/openeo/geotrellis/layers/FileLayerProvider.scala
@@ -989,8 +989,8 @@ class FileLayerProvider private(openSearch: OpenSearchClient, openSearchCollecti
 
     requiredSpacetimeKeys = applySpaceTimeMask(datacubeParams, requiredSpacetimeKeys,metadata)
     if (isUTM) {
-      //only for utm is just a safeguard to limit to sentine-1/2 for now
-      //try to resolve overlap before actually reqding the data
+      //only for utm is just a safeguard to limit to Sentinel-1/2 for now
+      //try to resolve overlap before actually reading the data
       requiredSpacetimeKeys = requiredSpacetimeKeys.groupByKey().flatMap(t => {
 
         def return_original = t._2.map(source => (t._1,source))
@@ -1049,7 +1049,7 @@ class FileLayerProvider private(openSearch: OpenSearchClient, openSearchCollecti
             if (filteredByCRS.nonEmpty) {
               filteredByCRS.map(distance_source => (key, distance_source._2))
             } else {
-              filteredByDistance.filter(_._1._1 == smallestCenterDistance).map(distance_source => (key, distance_source._2))
+              Seq(filteredByDistance.minBy(_._1._1)).map(distance_source => (key, distance_source._2))
             }
 
           }