corrected calculation of extract window at product borders

Author: TomBlock

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFields.java

@@ -27,7 +27,8 @@ class SatelliteFields {
     static Array readSubset(int numLayers, Rectangle era5RasterPosition, Variable variable) throws IOException, InvalidRangeException {
         Array subset;
 
-        final int maxRequestedX = era5RasterPosition.x + era5RasterPosition.width;
+        System.out.println("region: " + era5RasterPosition.x + " " + era5RasterPosition.y + " " + era5RasterPosition.width + " " + era5RasterPosition.height);
+        final int maxRequestedX = era5RasterPosition.x + era5RasterPosition.width - 1;
         if (era5RasterPosition.x < 0 || maxRequestedX >= RASTER_WIDTH) {
             subset = readVariableDataOverlapped(numLayers, era5RasterPosition, variable);
         } else {

post-processing-tool/src/test/java/com/bc/fiduceo/post/plugin/era5/SatelliteFields_IO_Test.java

@@ -93,6 +93,31 @@ public void testReadSubset_2D_antiMeridianOverlap_right() throws IOException, In
         }
     }
 
+    @Test
+    public void testReadSubset_2D_antiMeridianOverlap_right_JasminCrash() throws IOException, InvalidRangeException {
+        final File anMlFile = TestUtil.getTestDataFileAsserted("era-5/v1/an_ml/2008/06/02/ecmwf-era5_oper_an_ml_200806021000.lnsp.nc");
+
+        try (NetcdfFile netcdfFile = NetcdfFile.open(anMlFile.getAbsolutePath())) {
+            final Variable lnsp = netcdfFile.findVariable("lnsp");
+            assertNotNull(lnsp);
+
+            final Rectangle era5Positions = new Rectangle(1438, 66, 2, 2);
+
+            final Array lnspArray = SatelliteFields.readSubset(1, era5Positions, lnsp);
+            assertNotNull(lnspArray);
+
+            final int[] shape = lnspArray.getShape();
+            assertEquals(2, shape.length);
+            assertEquals(2, shape[0]);
+            assertEquals(2, shape[1]);
+
+            assertEquals(11.532238960266113f, lnspArray.getFloat(0), 1e-8);
+            assertEquals(11.532217025756836f, lnspArray.getFloat(1), 1e-8);
+            assertEquals(11.532645225524902f, lnspArray.getFloat(2), 1e-8);
+            assertEquals(11.532743453979492f, lnspArray.getFloat(3), 1e-8);
+        }
+    }
+
     @Test
     public void testReadSubset_2D_antiMeridianOverlap_left() throws IOException, InvalidRangeException {
         final File anMlFile = TestUtil.getTestDataFileAsserted("era-5/v1/an_sfc/2000/05/28/ecmwf-era5_oper_an_sfc_200005281700.10u.nc");