Change maven project version to 1.5.9-SNAPSHOT

SabineEmbacher · SabineEmbacher · commit a8c5e52618ea · 2023-09-06T20:12:15.000+02:00
The "equals()" implementation of com.bc.fiduceo.geometry.Point and subclasses has been changed to override Object.equals().
This change allows this equals method to be used in JUnit's assertEquals as usual.

SmapReader.extractGeoMinMax() has been changed to deal with the fact that the products are verically flipped and latitude values are flipped as well.
diff --git a/cems/pom.xml b/cems/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>fiduceo-master</artifactId>
         <groupId>com.bc.fiduceo</groupId>
-        <version>1.5.8</version>
+        <version>1.5.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fiduceo-master</artifactId>
         <groupId>com.bc.fiduceo</groupId>
-        <version>1.5.8</version>
+        <version>1.5.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/core/src/main/java/com/bc/fiduceo/geometry/Point.java b/core/src/main/java/com/bc/fiduceo/geometry/Point.java
@@ -32,5 +32,5 @@ public interface Point extends Geometry {
 
     void setLat(double lat);
 
-    boolean equals(Point other);
+    boolean equals(Object other);
 }
diff --git a/core/src/main/java/com/bc/fiduceo/geometry/jts/JTSPoint.java b/core/src/main/java/com/bc/fiduceo/geometry/jts/JTSPoint.java
@@ -80,7 +80,11 @@ public void setLat(double lat) {
     }
 
     @Override
-    public boolean equals(Point other) {
+    public boolean equals(Object o) {
+        if (o == null || !(o instanceof JTSPoint)) {
+            return false;
+        }
+        final JTSPoint other = (JTSPoint) o;
         return other == this || other.getLon() == getLon() && other.getLat() == getLat();
     }
 }
diff --git a/core/src/main/java/com/bc/fiduceo/geometry/s2/BcS2Point.java b/core/src/main/java/com/bc/fiduceo/geometry/s2/BcS2Point.java
@@ -103,7 +103,11 @@ public String toString() {
     }
 
     @Override
-    public boolean equals(Point other) {
+    public boolean equals(Object o) {
+        if (o == null || !(o instanceof BcS2Point)) {
+            return false;
+        }
+        final BcS2Point other = (BcS2Point) o;
         return other == this || other.getLon() == getLon() && other.getLat() == getLat();
     }
 
diff --git a/core/src/main/java/com/bc/fiduceo/reader/smap/SmapReader.java b/core/src/main/java/com/bc/fiduceo/reader/smap/SmapReader.java
@@ -409,21 +409,23 @@ private double[] extractGeoMinMax() throws IOException {
                     lonMax = minMax.max;
                 }
             }
-            for (int i = 0; i < height; i++) { // top down
+            // Find latitude maximum --> the product is mirrored vertically --> positive values are at the lower end.
+            for (int i = height - 1; i >= 0; i--) { // bottom up
                 latOrigin[dimIdxY] = i;
                 final Array section = latArr.section(latOrigin, horizontalSection);
                 final MAMath.MinMax minMax = MAMath.getMinMaxSkipMissingData(section, fillValue);
-                if (minMax.min == Double.MAX_VALUE) {
+                if (minMax.max == latMax) {
                     continue;
                 }
                 latMax = minMax.max;
                 break;
             }
-            for (int i = height - 1; i >= 0; i--) { // bottom up
+            // Find latitude minimum --> the product is mirrored vertically --> negative values are at the upper end.
+            for (int i = 0; i < height; i++) { // top down
                 latOrigin[dimIdxY] = i;
                 final Array section = latArr.section(latOrigin, horizontalSection);
                 final MAMath.MinMax minMax = MAMath.getMinMaxSkipMissingData(section, fillValue);
-                if (minMax.min == Double.MAX_VALUE) {
+                if (minMax.min == latMin) {
                     continue;
                 }
                 latMin = minMax.min;
diff --git a/core/src/test/java/com/bc/fiduceo/db/DbMaintenanceToolIntegrationTest.java b/core/src/test/java/com/bc/fiduceo/db/DbMaintenanceToolIntegrationTest.java
@@ -61,7 +61,7 @@ public void testInvalidCommandLine() throws ParseException {
             psE.flush();
 
             assertEquals("", out.toString());
-            assertEquals("db-maintenance-tool version 1.5.8" + ls +
+            assertEquals("db-maintenance-tool version 1.5.9-SNAPSHOT" + ls +
                     ls +
                     "usage: db_maintenance <options>" + ls +
                     "Valid options are:" + ls +
diff --git a/core/src/test/java/com/bc/fiduceo/db/DbMaintenanceToolTest.java b/core/src/test/java/com/bc/fiduceo/db/DbMaintenanceToolTest.java
@@ -59,7 +59,7 @@ public void testPrintUsageTo() {
 
         tool.printUsageTo(stream);
 
-        assertEquals("db-maintenance-tool version 1.5.8" + ls +
+        assertEquals("db-maintenance-tool version 1.5.9-SNAPSHOT" + ls +
                 ls +
                 "usage: db_maintenance <options>" + ls +
                 "Valid options are:" + ls +
diff --git a/core/src/test/java/com/bc/fiduceo/qc/MmdQCToolTest.java b/core/src/test/java/com/bc/fiduceo/qc/MmdQCToolTest.java
@@ -17,7 +17,7 @@ public void testPrintUsageTo() {
 
         MmdQCTool.printUsageTo(outputStream);
 
-        assertEquals("mmd-qc-tool version 1.5.8" + ls +
+        assertEquals("mmd-qc-tool version 1.5.9-SNAPSHOT" + ls +
                 ls +
                 "usage: mmd-qc-tool <options>" + ls +
                 "Valid options are:" + ls +
diff --git a/core/src/test/java/com/bc/fiduceo/reader/smap/SmapReader_IO_Test.java b/core/src/test/java/com/bc/fiduceo/reader/smap/SmapReader_IO_Test.java
@@ -67,15 +67,15 @@ public void testReadAcquisitionInfo() throws IOException {
             Point[] coordinates = boundingGeometry.getCoordinates();
             assertEquals(5, coordinates.length);
             assertEquals(-179.98402404785156, coordinates[0].getLon(), 1e-8);
-            assertEquals(86.34670257568361, coordinates[0].getLat(), 1e-8);
+            assertEquals(-86.61946868896484, coordinates[0].getLat(), 1e-8);
             assertEquals(179.99179077148438, coordinates[1].getLon(), 1e-8);
-            assertEquals(86.34670257568361, coordinates[1].getLat(), 1e-8);
+            assertEquals(-86.61946868896484, coordinates[1].getLat(), 1e-8);
             assertEquals(179.99179077148438, coordinates[2].getLon(), 1e-8);
-            assertEquals(-86.5008316040039, coordinates[2].getLat(), 1e-8);
+            assertEquals(86.40682220458984, coordinates[2].getLat(), 1e-8);
             assertEquals(-179.98402404785156, coordinates[3].getLon(), 1e-8);
-            assertEquals(-86.5008316040039, coordinates[3].getLat(), 1e-8);
+            assertEquals(86.40682220458984, coordinates[3].getLat(), 1e-8);
             assertEquals(-179.98402404785156, coordinates[4].getLon(), 1e-8);
-            assertEquals(86.34670257568361, coordinates[4].getLat(), 1e-8);
+            assertEquals(-86.61946868896484, coordinates[4].getLat(), 1e-8);
 
             final Date sensingStart = info.getSensingStart();
             TestUtil.assertCorrectUTCDate(2018, 2, 4, 20, 23, 11, sensingStart);
@@ -91,8 +91,12 @@ public void testReadAcquisitionInfo() throws IOException {
             assertEquals(4, coordinates.length);
             assertEquals(-179.98402404785156, coordinates[0].getLon(), 1e-8);
             assertEquals(0.0, coordinates[0].getLat(), 1e-8);
+            assertEquals(179.99179077148438, coordinates[1].getLon(), 1e-8);
+            assertEquals(0.0, coordinates[1].getLat(), 1e-8);
+            assertEquals(0.0, coordinates[2].getLon(), 1e-8);
+            assertEquals(86.40682220458984, coordinates[2].getLat(), 1e-8);
             assertEquals(0.0, coordinates[3].getLon(), 1e-8);
-            assertEquals(86.34670257568361, coordinates[3].getLat(), 1e-8);
+            assertEquals(-86.61946868896484, coordinates[3].getLat(), 1e-8);
 
             assertEquals(NodeType.UNDEFINED, info.getNodeType());
         } finally {
diff --git a/google-s2/pom.xml b/google-s2/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>com.bc.fiduceo</groupId>
     <artifactId>google-s2</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.9-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/ingestion-tool/pom.xml b/ingestion-tool/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>fiduceo-master</artifactId>
         <groupId>com.bc.fiduceo</groupId>
-        <version>1.5.8</version>
+        <version>1.5.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/ingestion-tool/src/test/java/com/bc/fiduceo/ingest/IngestionToolIntegrationTest.java b/ingestion-tool/src/test/java/com/bc/fiduceo/ingest/IngestionToolIntegrationTest.java
@@ -1095,6 +1095,8 @@ public void testIngest_windsat_coriolis() throws SQLException, ParseException {
         final Geometry geoBounds = observation.getGeoBounds();
         assertEquals("POLYGON((-179.93750000000003 -89.9375,179.93750000000003 -89.9375,179.93750000000003 89.9375,-179.93750000000003 89.9375,-179.93750000000003 -89.9375))",
                 geometryFactory.format(geoBounds));
+        final Geometry intersection = geoBounds.getIntersection(geometryFactory.createPoint(0, 0));
+        assertEquals(geometryFactory.createPoint(0, 0), intersection);
         final TimeAxis timeAxis = observation.getTimeAxes()[0];
         assertTrue(timeAxis instanceof L3TimeAxis);
         assertEquals("MULTILINESTRING((-179.93750000000003 0.0,179.93750000000003 0.0),(0.0 89.9375,0.0 -89.9375))", geometryFactory.format(timeAxis.getGeometry()));
@@ -1164,6 +1166,34 @@ public void testIngest_PIRATA() throws SQLException, ParseException {
         assertNull(observation.getTimeAxes());
     }
 
+    @Test
+    public void testIngest_smap_sss__for_look() throws SQLException, ParseException {
+        final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-s", "smap-sss-for", "-start", "2018-031", "-end", "2018-040", "-v", "v05.0"};
+
+        IngestionToolMain.main(args);
+
+        final List<SatelliteObservation> observations = storage.get();
+        assertEquals(1, observations.size());
+
+        final SatelliteObservation observation = getSatelliteObservation("RSS_SMAP_SSS_L2C_r16092_20180204T202311_2018035_FNL_V05.0.nc", observations);
+        TestUtil.assertCorrectUTCDate(2018, 2, 4, 20, 23, 11, observation.getStartTime());
+        TestUtil.assertCorrectUTCDate(2018, 2, 4, 22, 4, 56, observation.getStopTime());
+
+        assertEquals("smap-sss-for", observation.getSensor().getName());
+        assertEquals("v05.0", observation.getVersion());
+        assertEquals(NodeType.UNDEFINED, observation.getNodeType());
+
+        final Geometry geoBounds = observation.getGeoBounds();
+        assertEquals("POLYGON((-179.9690856933594 -86.61936950683594,179.9915313720703 -86.61936950683594,179.9915313720703 86.40787506103517,-179.9690856933594 86.40787506103517,-179.9690856933594 -86.61936950683594))",
+                     geometryFactory.format(geoBounds));
+        final Geometry intersection = geoBounds.getIntersection(geometryFactory.createPoint(0, 0));
+        assertEquals(geometryFactory.createPoint(0, 0), intersection);
+        final TimeAxis timeAxis = observation.getTimeAxes()[0];
+        assertTrue(timeAxis instanceof L3TimeAxis);
+        assertEquals("MULTILINESTRING((-179.9690856933594 0.0,179.9915313720703 0.0),(0.0 86.40787506103517,0.0 -86.61936950683594))", geometryFactory.format(timeAxis.getGeometry()));
+
+    }
+
     private void callMainAndValidateSystemOutput(String[] args, boolean errorOutputExpected) throws ParseException {
         final ByteArrayOutputStream expected = new ByteArrayOutputStream();
         new IngestionTool().printUsageTo(expected);
diff --git a/ingestion-tool/src/test/java/com/bc/fiduceo/ingest/IngestionToolTest.java b/ingestion-tool/src/test/java/com/bc/fiduceo/ingest/IngestionToolTest.java
@@ -59,7 +59,7 @@ public void testPrintUsageTo() {
 
         ingestionTool.printUsageTo(outputStream);
 
-        assertEquals("ingestion-tool version 1.5.8" + ls +
+        assertEquals("ingestion-tool version 1.5.9-SNAPSHOT" + ls +
                 ls +
                 "usage: ingestion-tool <options>" + ls +
                 "Valid options are:" + ls +
diff --git a/matchup-tool/pom.xml b/matchup-tool/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>fiduceo-master</artifactId>
         <groupId>com.bc.fiduceo</groupId>
-        <version>1.5.8</version>
+        <version>1.5.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolIntegrationTest.java b/matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolIntegrationTest.java
@@ -34,7 +34,7 @@
 public class MatchupToolIntegrationTest {
 
     private final String ls = System.lineSeparator();
-    private final String expectedPrintUsage = "matchup-tool version 1.5.8" + ls +
+    private final String expectedPrintUsage = "matchup-tool version 1.5.9-SNAPSHOT" + ls +
             ls +
             "usage: matchup-tool <options>" + ls +
             "Valid options are:" + ls +
diff --git a/matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolTest.java b/matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolTest.java
@@ -54,7 +54,7 @@ public void testPrintUsageTo() {
 
         matchupTool.printUsageTo(outputStream);
 
-        assertEquals("matchup-tool version 1.5.8" + ls +
+        assertEquals("matchup-tool version 1.5.9-SNAPSHOT" + ls +
                 ls +
                 "usage: matchup-tool <options>" + ls +
                 "Valid options are:" + ls +
diff --git a/pom.xml b/pom.xml
@@ -7,10 +7,10 @@
     <groupId>com.bc.fiduceo</groupId>
     <artifactId>fiduceo-master</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.8</version>
+    <version>1.5.9-SNAPSHOT</version>
 
     <properties>
-       <mms.version>1.5.8</mms.version>
+       <mms.version>1.5.9-SNAPSHOT</mms.version>
     </properties>
 
     <modules>
diff --git a/post-processing-tool/pom.xml b/post-processing-tool/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>fiduceo-master</artifactId>
         <groupId>com.bc.fiduceo</groupId>
-        <version>1.5.8</version>
+        <version>1.5.9-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/post-processing-tool/src/test/java/com/bc/fiduceo/post/PostProcessingToolTest.java b/post-processing-tool/src/test/java/com/bc/fiduceo/post/PostProcessingToolTest.java
@@ -127,7 +127,7 @@ public void testPrintUsage() {
         PostProcessingTool.printUsageTo(out);
 
         final String ls = System.lineSeparator();
-        final String expected = "post-processing-tool version 1.5.8" + ls +
+        final String expected = "post-processing-tool version 1.5.9-SNAPSHOT" + ls +
                 "" + ls +
                 "usage: post-processing-tool <options>" + ls +
                 "Valid options are:" + ls +

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ public interface Point extends Geometry {`
`32`	`32`
`33`	`33`	`void setLat(double lat);`
`34`	`34`
`35`		`- boolean equals(Point other);`
	`35`	`+ boolean equals(Object other);`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,11 @@ public void setLat(double lat) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`
`83`		`- public boolean equals(Point other) {`
	`83`	`+ public boolean equals(Object o) {`
	`84`	`+ if (o == null \|\| !(o instanceof JTSPoint)) {`
	`85`	`+ return false;`
	`86`	`+ }`
	`87`	`+ final JTSPoint other = (JTSPoint) o;`
`84`	`88`	`return other == this \|\| other.getLon() == getLon() && other.getLat() == getLat();`
`85`	`89`	`}`
`86`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,11 @@ public String toString() {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@Override`
`106`		`- public boolean equals(Point other) {`
	`106`	`+ public boolean equals(Object o) {`
	`107`	`+ if (o == null \|\| !(o instanceof BcS2Point)) {`
	`108`	`+ return false;`
	`109`	`+ }`
	`110`	`+ final BcS2Point other = (BcS2Point) o;`
`107`	`111`	`return other == this \|\| other.getLon() == getLon() && other.getLat() == getLat();`
`108`	`112`	`}`
`109`	`113`
Original file line number	Diff line number	Diff line change
`@@ -409,21 +409,23 @@ private double[] extractGeoMinMax() throws IOException {`
`409`	`409`	`lonMax = minMax.max;`
`410`	`410`	`}`
`411`	`411`	`}`
`412`		`- for (int i = 0; i < height; i++) { // top down`
	`412`	`+ // Find latitude maximum --> the product is mirrored vertically --> positive values are at the lower end.`
	`413`	`+ for (int i = height - 1; i >= 0; i--) { // bottom up`
`413`	`414`	`latOrigin[dimIdxY] = i;`
`414`	`415`	`final Array section = latArr.section(latOrigin, horizontalSection);`
`415`	`416`	`final MAMath.MinMax minMax = MAMath.getMinMaxSkipMissingData(section, fillValue);`
`416`		`- if (minMax.min == Double.MAX_VALUE) {`
	`417`	`+ if (minMax.max == latMax) {`
`417`	`418`	`continue;`
`418`	`419`	`}`
`419`	`420`	`latMax = minMax.max;`
`420`	`421`	`break;`
`421`	`422`	`}`
`422`		`- for (int i = height - 1; i >= 0; i--) { // bottom up`
	`423`	`+ // Find latitude minimum --> the product is mirrored vertically --> negative values are at the upper end.`
	`424`	`+ for (int i = 0; i < height; i++) { // top down`
`423`	`425`	`latOrigin[dimIdxY] = i;`
`424`	`426`	`final Array section = latArr.section(latOrigin, horizontalSection);`
`425`	`427`	`final MAMath.MinMax minMax = MAMath.getMinMaxSkipMissingData(section, fillValue);`
`426`		`- if (minMax.min == Double.MAX_VALUE) {`
	`428`	`+ if (minMax.min == latMin) {`
`427`	`429`	`continue;`
`428`	`430`	`}`
`429`	`431`	`latMin = minMax.min;`