corrected polygon-winding, started integration tests

Author: TomBlock

core/src/main/java/com/bc/fiduceo/reader/smos/SmosL1CDailyGriddedReader.java

@@ -346,13 +346,13 @@ private void setSensingTimes(AcquisitionInfo acquisitionInfo) {
         utcCalendar.set(Calendar.MONTH, ymd[1] - 1);    // month is zero-based tb 2022-09-15
         utcCalendar.set(Calendar.DAY_OF_MONTH, ymd[2]);
 
-        utcCalendar.set(Calendar.HOUR, 0);
+        utcCalendar.set(Calendar.HOUR_OF_DAY, 0);
         utcCalendar.set(Calendar.MINUTE, 0);
         utcCalendar.set(Calendar.SECOND, 0);
 
         acquisitionInfo.setSensingStart(utcCalendar.getTime());
 
-        utcCalendar.set(Calendar.HOUR, 23);
+        utcCalendar.set(Calendar.HOUR_OF_DAY, 23);
         utcCalendar.set(Calendar.MINUTE, 59);
         utcCalendar.set(Calendar.SECOND, 59);
 
@@ -372,9 +372,9 @@ static Polygon createPolygonFromMinMax(double[] geoMinMax, GeometryFactory geome
         final Point lr = geometryFactory.createPoint(lonMax, latMin);
         final ArrayList<Point> polygonPoints = new ArrayList<>();
         polygonPoints.add(ll);
-        polygonPoints.add(ul);
-        polygonPoints.add(ur);
         polygonPoints.add(lr);
+        polygonPoints.add(ur);
+        polygonPoints.add(ul);
         polygonPoints.add(ll);
         return geometryFactory.createPolygon(polygonPoints);
     }

core/src/test/java/com/bc/fiduceo/reader/smos/SmosL1CDailyGriddedReader_IO_Test.java

@@ -70,8 +70,8 @@ public void testReadAcquisitionInfo_CDF3TA() throws IOException {
             assertEquals(5, coordinates.length);
             assertEquals(-179.8703155517578, coordinates[0].getLon(), 1e-8);
             assertEquals(-83.51713562011719, coordinates[0].getLat(), 1e-8);
-            assertEquals(-179.8703155517578, coordinates[1].getLon(), 1e-8);
-            assertEquals(83.51713562011719, coordinates[1].getLat(), 1e-8);
+            assertEquals(179.8703155517578, coordinates[1].getLon(), 1e-8);
+            assertEquals(-83.51713562011719, coordinates[1].getLat(), 1e-8);
 
             final Date sensingStart = acquisitionInfo.getSensingStart();
             TestUtil.assertCorrectUTCDate(2016, 6, 10, 0, 0, 0, sensingStart);

ingestion-tool/src/test/java/com/bc/fiduceo/ingest/IngestionToolIntegrationTest.java

@@ -1167,7 +1167,7 @@ public void testIngest_miras_smos_CDF3TD() throws SQLException, ParseException {
             assertEquals("re07", observation.getVersion());
 
             final Geometry geoBounds = observation.getGeoBounds();
-            assertEquals("POLYGON((-179.8703155517578 -83.51713562011719,-179.8703155517578 83.51713562011719,179.8703155517578 83.51713562011719,179.8703155517578 -83.51713562011719,-179.8703155517578 -83.51713562011719))",
+            assertEquals("POLYGON((-179.8703155517578 -83.51713562011719,179.8703155517578 -83.51713562011719,179.8703155517578 83.51713562011719,-179.8703155517578 83.51713562011719,-179.8703155517578 -83.51713562011719))",
                     geometryFactory.format(geoBounds));
             final TimeAxis timeAxis = observation.getTimeAxes()[0];
             assertTrue(timeAxis instanceof L3TimeAxis);

matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolIntegrationTest_SMOSL1_drifter.java

@@ -0,0 +1,69 @@
+package com.bc.fiduceo.matchup;
+
+import com.bc.fiduceo.TestUtil;
+import com.bc.fiduceo.core.SatelliteObservation;
+import com.bc.fiduceo.core.Sensor;
+import com.bc.fiduceo.core.UseCaseConfig;
+import com.bc.fiduceo.db.DbAndIOTestRunner;
+import org.apache.commons.cli.ParseException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(DbAndIOTestRunner.class)
+public class MatchupToolIntegrationTest_SMOSL1_drifter extends AbstractUsecaseIntegrationTest {
+
+    @Test
+    public void testMatchup() throws IOException, SQLException, ParseException {
+        final UseCaseConfig useCaseConfig = createUseCaseConfigBuilder()
+                .withTimeDeltaSeconds(7200, null)
+                .withMaxPixelDistanceKm(2, null)
+                .createConfig();
+        final File useCaseConfigFile = storeUseCaseConfig(useCaseConfig, "usecase-43.xml");
+
+        insert_SIRDS();
+        insert_miras_CDF3TD();
+
+        // @todo 1 tb/tb continue here 2022-10-14
+        // final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-u", useCaseConfigFile.getName(), "-start", "2017-324", "-end", "2017-324"};
+        // MatchupToolMain.main(args);
+    }
+
+    private void insert_SIRDS() throws IOException, SQLException {
+        final String sensorKey = "drifter-sirds";
+        final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{"insitu", "sirds", "v1.0", "SSTCCI2_refdata_drifter_201711.nc"}, true);
+
+        final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "v1.0");
+        storage.insert(satelliteObservation);
+    }
+
+    private void insert_miras_CDF3TD() throws IOException, SQLException {
+        final String sensorKey = "miras-smos-CDF3TD";
+        final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{sensorKey, "re07", "2017", "324", "SM_RE07_MIR_CDF3TD_20171120T000000_20171120T235959_330_001_7.tgz"}, true);
+
+        final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "v1");
+        storage.insert(satelliteObservation);
+    }
+
+    private MatchupToolTestUseCaseConfigBuilder createUseCaseConfigBuilder() {
+        final List<Sensor> sensorList = new ArrayList<>();
+        final Sensor primary = new Sensor("drifter-sirds");
+        primary.setPrimary(true);
+        sensorList.add(primary);
+        sensorList.add(new Sensor("miras-smos-CDF3TD"));
+
+        final List<com.bc.fiduceo.core.Dimension> dimensions = new ArrayList<>();
+        dimensions.add(new com.bc.fiduceo.core.Dimension("drifter-sirds", 1, 1));
+        dimensions.add(new com.bc.fiduceo.core.Dimension("miras-smos-CDF3TD", 3, 3));
+
+        return (MatchupToolTestUseCaseConfigBuilder) new MatchupToolTestUseCaseConfigBuilder("mmd43")
+                .withSensors(sensorList)
+                .withOutputPath(new File(TestUtil.getTestDir().getPath(), "usecase-43").getPath())
+                .withDimensions(dimensions);
+    }
+}