AVHRR MetOpC - intermediate

Author: TomBlock

core/src/main/java/com/bc/fiduceo/reader/avhrr_frac/AVHRR_FRAC_Reader.java

@@ -27,7 +27,7 @@
 
 public class AVHRR_FRAC_Reader extends SNAP_Reader {
 
-    private static final String REG_EX = "NSS.FRAC.M([12]).D\\d{5}.S\\d{4}.E\\d{4}.B\\d{7}.[A-Z]{2,2}(.gz){0,1}";
+    private static final String REG_EX = "NSS.FRAC.M([123]).D\\d{5}.S\\d{4}.E\\d{4}.B\\d{7}.[A-Z]{2,2}(.gz){0,1}";
     private static final Interval INTERVAL = new Interval(5, 20);
     private static final int NUM_SPLITS = 2;
     private final ReaderContext readerContext;

core/src/main/java/com/bc/fiduceo/reader/avhrr_frac/AVHRR_FRAC_ReaderPlugin.java

@@ -7,7 +7,7 @@
 
 public class AVHRR_FRAC_ReaderPlugin implements ReaderPlugin {
 
-    private static final String[] SENSOR_KEYS = {"avhrr-frac-ma", "avhrr-frac-mb"};
+    private static final String[] SENSOR_KEYS = {"avhrr-frac-ma", "avhrr-frac-mb", "avhrr-frac-mc"};
 
     @Override
     public Reader createReader(ReaderContext readerContext) {

core/src/test/java/com/bc/fiduceo/reader/avhrr_frac/AVHRR_FRAC_ReaderPluginTest.java

@@ -34,7 +34,7 @@ public void testGetDataType() {
 
     @Test
     public void testGetSupportedSensorKeys(){
-        final String[] expected = {"avhrr-frac-ma", "avhrr-frac-mb"};
+        final String[] expected = {"avhrr-frac-ma", "avhrr-frac-mb", "avhrr-frac-mc"};
         final String[] keys = plugin.getSupportedSensorKeys();
 
         assertArrayEquals(expected, keys);

core/src/test/java/com/bc/fiduceo/reader/avhrr_frac/AVHRR_FRAC_ReaderTest.java

@@ -22,7 +22,7 @@ public void setUp() {
 
     @Test
     public void testGetRegEx() {
-        final String expected = "NSS.FRAC.M([12]).D\\d{5}.S\\d{4}.E\\d{4}.B\\d{7}.[A-Z]{2,2}(.gz){0,1}";
+        final String expected = "NSS.FRAC.M([123]).D\\d{5}.S\\d{4}.E\\d{4}.B\\d{7}.[A-Z]{2,2}(.gz){0,1}";
 
         assertEquals(expected, reader.getRegEx());
 
@@ -46,6 +46,9 @@ public void testGetRegEx() {
         matcher = pattern.matcher("NSS.FRAC.M1.D19254.S0220.E0319.B3621920.SV");
         assertTrue(matcher.matches());
 
+        matcher = pattern.matcher("NSS.FRAC.M3.D19261.S1708.E1849.B0448586.SV");
+        assertTrue(matcher.matches());
+
         matcher = pattern.matcher("AT2_TOA_1PURAL19980424_055754_000000001031_00348_15733_0000.OT");
         assertFalse(matcher.matches());
 

core/src/test/java/com/bc/fiduceo/reader/avhrr_frac/AVHRR_FRAC_Reader_IO_Test.java

@@ -124,8 +124,6 @@ public void testReadAcquisitionInfo_MB() throws IOException {
             assertTrue(boundingGeometry instanceof Polygon);
             final Polygon polygon = (Polygon) boundingGeometry;
 
-            System.out.println(GeometryUtil.toPointListWkt(polygon));
-
             final Point[] coordinates = polygon.getCoordinates();
             assertEquals(75, coordinates.length);
             assertEquals(59.658199310302734, coordinates[0].getLon(), 1e-8);
@@ -187,6 +185,48 @@ public void testReadAcquisitionInfo_MA_GZ() throws IOException {
         }
     }
 
+    @Test
+    public void testReadAcquisitionInfo_MC() throws IOException {
+        final File file = getAvhrrFRAC_MC_File();
+
+        try {
+            reader.open(file);
+
+            final AcquisitionInfo acquisitionInfo = reader.read();
+            assertNotNull(acquisitionInfo);
+
+            final Date sensingStart = acquisitionInfo.getSensingStart();
+            TestUtil.assertCorrectUTCDate(2019, 9, 11, 2, 20, 46, sensingStart);
+
+            final Date sensingStop = acquisitionInfo.getSensingStop();
+            TestUtil.assertCorrectUTCDate(2019, 9, 11, 3, 19, 28, sensingStop);
+
+            final NodeType nodeType = acquisitionInfo.getNodeType();
+            assertEquals(NodeType.UNDEFINED, nodeType);
+
+            final Geometry boundingGeometry = acquisitionInfo.getBoundingGeometry();
+            assertNotNull(boundingGeometry);
+            assertTrue(boundingGeometry instanceof Polygon);
+            final Polygon polygon = (Polygon) boundingGeometry;
+
+            final Point[] coordinates = polygon.getCoordinates();
+            assertEquals(75, coordinates.length);
+            assertEquals(59.658199310302734, coordinates[0].getLon(), 1e-8);
+            assertEquals(-61.54189682006836, coordinates[0].getLat(), 1e-8);
+
+            assertEquals(99.13909912109376, coordinates[28].getLon(), 1e-8);
+            assertEquals(80.86370086669922, coordinates[28].getLat(), 1e-8);
+
+            final TimeAxis[] timeAxes = acquisitionInfo.getTimeAxes();
+            assertEquals(1, timeAxes.length);
+
+            Date time = timeAxes[0].getTime(coordinates[0]);
+            TestUtil.assertCorrectUTCDate(2019, 9, 11, 2, 20, 46, time);
+        } finally {
+            reader.close();
+        }
+    }
+
     @Test
     public void testGetTimeLocator_MA() throws IOException {
         final File file = getAvhrrFRAC_MA_File();
@@ -782,4 +822,9 @@ private File getAvhrrFRAC_MA_GZ_File() throws IOException {
         final String testFilePath = TestUtil.assembleFileSystemPath(new String[]{"avhrr-frac-ma", "v1", "2014", "11", "09", "NSS.FRAC.M1.D14313.S1746.E1837.B1112525.MM.gz"}, false);
         return TestUtil.getTestDataFileAsserted(testFilePath);
     }
+
+    private File getAvhrrFRAC_MC_File() throws IOException {
+        final String testFilePath = TestUtil.assembleFileSystemPath(new String[]{"avhrr-frac-mc", "v1", "2019", "09", "18", "NSS.FRAC.M3.D19261.S1708.E1849.B0448586.SV"}, false);
+        return TestUtil.getTestDataFileAsserted(testFilePath);
+    }
 }