Skip to content

Snap 3767 crash with CZCS data #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TomBlock wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Snap 3767 crash with CZCS data #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebbffe9
implement new selection algorithm
TomBlock Aug 1, 2024
99178bb
[NO-JIRA](opttbx-s2msi-reader): Fix the problem with wrong fileName o…
a-draghici Aug 1, 2024
87a55f2
[SNAP-3756] fix
Aug 2, 2024
c8b8e80
resolved SNAP-3767
TomBlock Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions opttbx-rad2refl/src/main/java/eu/esa/opt/processor/rad2refl/Rad2ReflAuxdata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ public class Rad2ReflAuxdata {
public static Rad2ReflAuxdata loadMERISAuxdata(String productType) throws IOException {
final Path auxdataDir = installAuxdata();

if (productType.startsWith("MER_F")) {
final ResolutionType resolutionType = getResolutionType(productType);
if (resolutionType == ResolutionType.FULL) {
return loadFRAuxdata(auxdataDir);
} else if (productType.startsWith("MER_R")) {
} else if (resolutionType == ResolutionType.REDUCED) {
return loadRRAuxdata(auxdataDir);
} else {
throw new IOException(String.format("No auxillary data found for input product of type '%s'", productType));
Expand Down
1 change: 1 addition & 0 deletions opttbx-rad2refl/src/test/java/eu/esa/opt/processor/rad2refl/Rad2ReflAuxdataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public void testGetResolutionType() {

assertEquals(ResolutionType.FULL, Rad2ReflAuxdata.getResolutionType("MER_FR__1P"));
assertEquals(ResolutionType.FULL, Rad2ReflAuxdata.getResolutionType("Derived from(MER_FRS_1P)"));
assertEquals(ResolutionType.FULL, Rad2ReflAuxdata.getResolutionType("Derived from (MER_FRS_1P)"));

assertEquals(ResolutionType.UNKNOWN, Rad2ReflAuxdata.getResolutionType("STRANGE-TYPE"));
}
Expand Down
4 changes: 3 additions & 1 deletion opttbx-s2msi-reader/src/main/java/eu/esa/opt/dataio/s2/S2Metadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,10 @@ public static int getFullPSDversion(VirtualPath path){
psd = 148;
} else if(Integer.parseInt(psdNumber) == 14 && !aux.contains("L2A_Product_Info") && !aux.contains("TILE_ID_2A")) {
psd = 143;
}else{
}else if(Integer.parseInt(psdNumber) >= 15){
psd = Integer.parseInt(psdNumber) * 10;
} else {
psd = Integer.parseInt(psdNumber);
}
} else {
psd = 0;
Expand Down
2 changes: 1 addition & 1 deletion ...-reader/src/main/java/eu/esa/opt/dataio/s2/l2a/metadata/L2aGranuleMetadataGenericPSD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public S2Metadata.MaskFilename[] getMasks(VirtualPath path) {
}
for (String maskFilename : maskFilenames) {
//To be sure that it is not a relative path and finish with .gml
String filenameProcessed = Paths.get(maskFilename).getFileName().toString();
String filenameProcessed = Paths.get(maskFilename.replaceAll("\\\\","/")).getFileName().toString();
if(gmlMaskFormat){
if(!filenameProcessed.endsWith(".gml")) {
filenameProcessed = filenameProcessed + ".gml";
Expand Down
28 changes: 19 additions & 9 deletions opttbx-seadas-reader/src/main/java/gov/nasa/gsfc/seadas/dataio/SeadasFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,10 +575,7 @@ protected void addFlagsAndMasks(Product product) {
if (metadataElementBand != null) {
MetadataElement metadataElementL2Flags = metadataElementBand.getElement("l2_flags");
if (metadataElementL2Flags != null) {
flagMeanings =metadataElementL2Flags.getAttribute("FLAG_MEANINGS").getData().getElemString();
if (flagMeanings != null) {
flagNames = flagMeanings.split(" ");
}
setFlagMeaningsAndNames(product, metadataElementL2Flags);
}
}
} catch (Exception ignore) {
Expand Down Expand Up @@ -1170,11 +1167,24 @@ protected void addFlagsAndMasks(Product product) {
}
}






private void setFlagMeaningsAndNames(Product product, MetadataElement metadataElementL2Flags) {
final MetadataAttribute flagMeaningsAttribute = metadataElementL2Flags.getAttribute("FLAG_MEANINGS");
if (flagMeaningsAttribute != null) {
flagMeanings = flagMeaningsAttribute.getData().getElemString();
flagNames = flagMeanings.split(" ");
} else {
final MetadataElement global = product.getMetadataRoot().getElement("Global_Attributes");
if (global != null) {
final MetadataAttribute maskNamesAttribute = global.getAttribute("Mask_Names");
if (maskNamesAttribute != null) {
flagMeanings = maskNamesAttribute.getData().getElemString();
if (flagMeanings != null) {
flagNames = flagMeanings.split(",");
}
}
}
}
}


private Mask createMask(Product product, String maskName, Color maskColor, double maskTransparency) {
Expand Down