Fix compile time error in test. #177

Open-EO · Jul 14, 2023 · 61a5719 · 61a5719
1 parent 9c83b96
commit 61a5719
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 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,8 +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)
+        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
@@ -17,9 +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)
-//    val xmlDoc = XML.load(CreoFeatureCollection.loadMetadata(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

diff --git a/openeo-geotrellis/src/test/resources/log4j2-test.xml b/openeo-geotrellis/src/test/resources/log4j2-test.xml
@@ -30,7 +30,7 @@
 
         <Logger name="org.openeo.geotrellis.ComputeStatsGeotrellisAdapter" level="debug" />
         <Logger name="org.openeo.opensearch.OpenSearchClient" level="debug" />
-        <Root level="info">
+        <Root level="warn">
             <AppenderRef ref="stdout" />
         </Root>
     </Loggers>

diff --git a/...lis/src/test/scala/org/openeo/geotrellis/layers/SentinelXMLMetadataRasterSourceTest.scala b/...lis/src/test/scala/org/openeo/geotrellis/layers/SentinelXMLMetadataRasterSourceTest.scala
@@ -8,7 +8,7 @@ class SentinelXMLMetadataRasterSourceTest {
 
   @Test
   def testReadAngles(): Unit = {
-    val source: Seq[SentinelXMLMetadataRasterSource] = SentinelXMLMetadataRasterSource(getClass.getResource("/org/openeo/geotrellis/layers/MTD_TL.xml"))
+    val source: Seq[SentinelXMLMetadataRasterSource] = SentinelXMLMetadataRasterSource(getClass.getResource("/org/openeo/geotrellis/layers/MTD_TL.xml").getPath)
     assertEquals( 171.800, source(0).read().get.tile.band(0).getDouble(0,0),0.001)
     assertEquals(  65.707, source(1).read().get.tile.band(0).getDouble(0,0),0.001)
     assertEquals( 251.333, source(2).read().get.tile.band(0).getDouble(0,0),0.001)