From 869f47586d6d102d2a803c733e5d08d916394cbb Mon Sep 17 00:00:00 2001 From: Marco Date: Thu, 14 Nov 2024 10:10:41 +0100 Subject: [PATCH] Simplify spectral information addition logic Removed conditional checks based on `psd` value for adding spectral information. Now all resolutions consistently add `B1` band information with a spatial resolution of `R60M`. This fixes the compatibility of the masks with the reflectance data. --- .../dataio/s2/l2a/metadata/L2aMetadataProc.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/opttbx-s2msi-reader/src/main/java/eu/esa/opt/dataio/s2/l2a/metadata/L2aMetadataProc.java b/opttbx-s2msi-reader/src/main/java/eu/esa/opt/dataio/s2/l2a/metadata/L2aMetadataProc.java index 157cb9d618..85f5077158 100644 --- a/opttbx-s2msi-reader/src/main/java/eu/esa/opt/dataio/s2/l2a/metadata/L2aMetadataProc.java +++ b/opttbx-s2msi-reader/src/main/java/eu/esa/opt/dataio/s2/l2a/metadata/L2aMetadataProc.java @@ -115,10 +115,7 @@ public static List getBandInformationList(String format, S2Sp List aInfo = new ArrayList<>(); switch (resolution) { case R10M: - if(psd>147) - aInfo.add(makeSpectralInformation(format, S2BandConstants.B1, S2SpatialResolution.R20M, boaQuantification)); - else - aInfo.add(makeSpectralInformation(format, S2BandConstants.B1, S2SpatialResolution.R60M, boaQuantification)); + aInfo.add(makeSpectralInformation(format, S2BandConstants.B1, S2SpatialResolution.R60M, boaQuantification)); aInfo.add(makeSpectralInformation(format, S2BandConstants.B2, S2SpatialResolution.R10M, boaQuantification)); aInfo.add(makeSpectralInformation(format, S2BandConstants.B3, S2SpatialResolution.R10M, boaQuantification)); aInfo.add(makeSpectralInformation(format, S2BandConstants.B4, S2SpatialResolution.R10M, boaQuantification)); @@ -142,10 +139,7 @@ public static List getBandInformationList(String format, S2Sp aInfo.add(makeSCLInformation(format, S2SpatialResolution.R20M, psd)); break; case R20M: - if(psd>147) - aInfo.add(makeSpectralInformation(format, S2BandConstants.B1, S2SpatialResolution.R20M, boaQuantification)); - else - aInfo.add(makeSpectralInformation(format, S2BandConstants.B1, S2SpatialResolution.R60M, boaQuantification)); + aInfo.add(makeSpectralInformation(format, S2BandConstants.B1, S2SpatialResolution.R60M, boaQuantification)); aInfo.add(makeSpectralInformation(format, S2BandConstants.B2, S2SpatialResolution.R20M, boaQuantification)); aInfo.add(makeSpectralInformation(format, S2BandConstants.B3, S2SpatialResolution.R20M, boaQuantification)); aInfo.add(makeSpectralInformation(format, S2BandConstants.B4, S2SpatialResolution.R20M, boaQuantification)); @@ -168,10 +162,7 @@ public static List getBandInformationList(String format, S2Sp aInfo.add(makeSCLInformation(format, S2SpatialResolution.R20M, psd)); break; case R60M: - if(psd > 147) - aInfo.add(makeSpectralInformation(format, S2BandConstants.B1, S2SpatialResolution.R20M, boaQuantification)); - else - aInfo.add(makeSpectralInformation(format, S2BandConstants.B1, S2SpatialResolution.R60M, boaQuantification)); + aInfo.add(makeSpectralInformation(format, S2BandConstants.B1, S2SpatialResolution.R60M, boaQuantification)); aInfo.add(makeSpectralInformation(format, S2BandConstants.B2, S2SpatialResolution.R60M, boaQuantification)); aInfo.add(makeSpectralInformation(format, S2BandConstants.B3, S2SpatialResolution.R60M, boaQuantification)); aInfo.add(makeSpectralInformation(format, S2BandConstants.B4, S2SpatialResolution.R60M, boaQuantification));