Use loadMetadata #177

Open-EO · Jul 5, 2023 · 109758c · 109758c
1 parent 6ef811a
commit 109758c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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
@@ -956,7 +956,7 @@ class FileLayerProvider(openSearch: OpenSearchClient, openSearchCollectionId: St
         }
       }else if(dataPath.endsWith("MTD_TL.xml")) {
         //TODO EP-3611 parse angles
-        SentinelXMLMetadataRasterSource(new URL(vsisToHttpsCreo(dataPath)),bands)
+        SentinelXMLMetadataRasterSource(dataPath, bands)
       }
       else {
         def alignmentFromDataPath(dataPath: String, projectedExtent: ProjectedExtent): TargetRegion = {

diff --git a/...trellis/src/main/scala/org/openeo/geotrellis/layers/SentinelXMLMetadataRasterSource.scala b/...trellis/src/main/scala/org/openeo/geotrellis/layers/SentinelXMLMetadataRasterSource.scala
@@ -4,6 +4,7 @@ import geotrellis.proj4.CRS
 import geotrellis.raster.io.geotiff.OverviewStrategy
 import geotrellis.raster.{CellSize, CellType, FloatConstantNoDataCellType, FloatConstantTile, GridBounds, GridExtent, MultibandTile, Raster, RasterMetadata, RasterSource, ResampleMethod, ResampleTarget, SourceName, TargetCellType}
 import geotrellis.vector.Extent
+import org.openeo.opensearch.OpenSearchResponses.CreoFeatureCollection
 
 import java.net.URL
 import scala.xml.XML
@@ -16,8 +17,8 @@ object SentinelXMLMetadataRasterSource {
    * @param bands
    * @return
    */
-  def apply(path:URL, bands:Seq[Int]=Seq(0,1,2,3)): Seq[SentinelXMLMetadataRasterSource] = {
-    val xmlDoc = XML.load(path)
+  def apply(path:String, bands:Seq[Int]=Seq(0,1,2,3)): Seq[SentinelXMLMetadataRasterSource] = {
+    val xmlDoc = XML.load(CreoFeatureCollection.loadMetadata(path))
     val angles = xmlDoc \\ "Tile_Angles"
     val meanSun = angles \ "Mean_Sun_Angle"
     val mSZA = ( meanSun \ "ZENITH_ANGLE").text.toFloat