Idepix OLCI: adapted retrieval of resolution by product type to latest SNAP ProductUtils

Author: dolaf

idepix-olci/src/main/java/org/esa/snap/idepix/olci/IdepixOlciUtils.java

@@ -250,14 +250,14 @@ private static double getHeightFromCtp(double ctp, double p0, double ts) {
 
     static boolean isReducedResolution(Product sourceProduct) {
 //        return sourceProduct.getName().matches("S3.?_OL_1_.*RR_.*.SEN3");
-        // less strict to allow subsets:
-        return sourceProduct.getProductType().endsWith("RR");
+        // less strict to allow subsets, adapted to definition in ProductUtils::
+        return sourceProduct.getProductType().contains("OL_1_ERR");
     }
 
     static boolean isFullResolution(Product sourceProduct) {
 //        return sourceProduct.getName().matches("S3.?_OL_1_.*FR_.*.SEN3");
-        // less strict to allow subsets:
-        return sourceProduct.getProductType().endsWith("FR");
+        // less strict to allow subsets, adapted to definition in ProductUtils:
+        return sourceProduct.getProductType().contains("OL_1_EFR");
     }
 
     static float[] interpolateViewAngles(PolynomialFitter curveFitter1, PolynomialFitter curveFitter2,

idepix-olci/src/test/java/org/esa/snap/idepix/olci/IdepixOlciUtilsTest.java

@@ -252,19 +252,19 @@ public void testGetMonthFromStartStopTime() throws ParseException {
 
     @Test
     public void testIsReducedResolution() {
-        Product testProduct = new Product("S3B_OL_1_EFR____blabla.SEN3", "test_FR", 1, 1);
+        Product testProduct = new Product("S3B_OL_1_EFR____blabla.SEN3", "OL_1_EFR", 1, 1);
         assertFalse(IdepixOlciUtils.isReducedResolution(testProduct));
 
-        testProduct = new Product("S3B_OL_1_ERR____blabla.SEN3", "test_RR", 1, 1);
+        testProduct = new Product("S3B_OL_1_ERR____blabla.SEN3", "OL_1_ERR", 1, 1);
         assertTrue(IdepixOlciUtils.isReducedResolution(testProduct));
     }
 
     @Test
     public void testIsFullResolution() {
-        Product testProduct = new Product("S3B_OL_1_EFR____blabla.SEN3", "test_FR", 1, 1);
+        Product testProduct = new Product("S3B_OL_1_EFR____blabla.SEN3", "Derived from (OL_1_EFR)", 1, 1);
         assertTrue(IdepixOlciUtils.isFullResolution(testProduct));
 
-        testProduct = new Product("S3B_OL_1_ERR____blabla.SEN3", "test_RR", 1, 1);
+        testProduct = new Product("S3B_OL_1_ERR____blabla.SEN3", "Derived from (OL_1_ERR)", 1, 1);
         assertFalse(IdepixOlciUtils.isFullResolution(testProduct));
     }
 }