corrected window reading issue

Author: TomBlock

core/src/main/java/com/bc/fiduceo/reader/atsr/ATSR_L1B_Reader.java

@@ -120,7 +120,7 @@ public Array readRaw(int centerX, int centerY, Interval interval, String variabl
         final DataType targetDataType = NetCDFUtils.getNetcdfDataType(dataNode.getDataType());
         final int[] shape = getShape(interval);
         final Array readArray = Array.factory(targetDataType, shape);
-        final Array targetArray = Array.factory(targetDataType, shape);
+        final Array targetArray = NetCDFUtils.create(targetDataType, shape, noDataValue);
 
         final int width = interval.getX();
         final int height = interval.getY();
@@ -136,12 +136,11 @@ public Array readRaw(int centerX, int centerY, Interval interval, String variabl
             final int currentY = yOffset + y;
             for (int x = 0; x < height; x++) {
                 final int currentX = xOffset + x;
-                index.set(y, x);
+
                 if (currentX >= 0 && currentX < sceneRasterWidth && currentY >= 0 && currentY < sceneRasterHeight) {
+                    index.set(y, x);
                     targetArray.setObject(index, readArray.getObject(readIndex));
                     ++readIndex;
-                } else {
-                    targetArray.setObject(index, noDataValue);
                 }
             }
         }

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

@@ -119,7 +119,7 @@ public Array readRaw(int centerX, int centerY, Interval interval, String variabl
         final DataType targetDataType = NetCDFUtils.getNetcdfDataType(dataNode.getDataType());
         final int[] shape = getShape(interval);
         final Array readArray = Array.factory(targetDataType, shape);
-        final Array targetArray = Array.factory(targetDataType, shape);
+        final Array targetArray = NetCDFUtils.create(targetDataType, shape, noDataValue);
 
         final int width = interval.getX();
         final int height = interval.getY();
@@ -138,12 +138,11 @@ public Array readRaw(int centerX, int centerY, Interval interval, String variabl
             final int currentY = yOffset + y;
             for (int x = 0; x < height; x++) {
                 final int currentX = xOffset + x;
-                index.set(y, x);
+
                 if (currentX >= 0 && currentX < sceneRasterWidth && currentY >= 0 && currentY < sceneRasterHeight) {
+                    index.set(y, x);
                     targetArray.setObject(index, readArray.getObject(readIndex));
                     ++readIndex;
-                } else {
-                    targetArray.setObject(index, noDataValue);
                 }
             }
         }

core/src/main/java/com/bc/fiduceo/reader/slstr/SlstrReader.java

@@ -225,7 +225,7 @@ public Array readRaw(int centerX, int centerY, Interval interval, String variabl
         final int height = mappedInterval.getY();
         final int[] shape = getShape(mappedInterval);
         final Array readArray = Array.factory(targetDataType, shape);
-        final Array targetArray = Array.factory(targetDataType, shape);
+        final Array targetArray = NetCDFUtils.create(targetDataType, shape, noDataValue);
 
         final int mappedX = (int) (transform.mapCoordinate_X(centerX) + 0.5);
         final int mappedY = (int) (transform.mapCoordinate_Y(centerY) + 0.5);
@@ -241,12 +241,11 @@ public Array readRaw(int centerX, int centerY, Interval interval, String variabl
             final int currentY = yOffset + y;
             for (int x = 0; x < height; x++) {
                 final int currentX = xOffset + x;
-                index.set(y, x);
+
                 if (currentX >= 0 && currentX < rasterSize.getNx() && currentY >= 0 && currentY < rasterSize.getNy()) {
+                    index.set(y, x);
                     targetArray.setObject(index, readArray.getObject(readIndex));
                     ++readIndex;
-                } else {
-                    targetArray.setObject(index, noDataValue);
                 }
             }
         }

core/src/main/java/com/bc/fiduceo/util/NetCDFUtils.java

@@ -30,6 +30,7 @@
 import ucar.nc2.iosp.netcdf3.N3iosp;
 import ucar.unidata.io.RandomAccessFile;
 
+import javax.xml.crypto.Data;
 import java.io.IOException;
 
 public class NetCDFUtils {
@@ -466,4 +467,14 @@ public static Array create(double[][] data) {
         final int[] shape = new int[]{data.length, linelength};
         return Array.factory(DataType.DOUBLE, shape, flatData);
     }
+
+    public static Array create(DataType dataType, int[] shape, Number fillValue) {
+        final Array array = Array.factory(dataType, shape);
+        final int size = (int) array.getSize();
+        for (int i = 0; i < size; i++) {
+            array.setObject(i, fillValue);
+        }
+
+        return array;
+    }
 }

core/src/test/java/com/bc/fiduceo/util/NetCDFUtilsTest.java

@@ -730,6 +730,34 @@ public void testCreateArray_double_2D() {
         assertEquals(11.0, doubleArray.getDouble(4), 1e-8);
         assertEquals(14.0, doubleArray.getDouble(7), 1e-8);
     }
+
+    @Test
+    public void testCreateWithFillValue_int() {
+        final Array intArray = NetCDFUtils.create(DataType.INT, new int[] {2, 3}, -11);
+        final int[] shape = intArray.getShape();
+        assertEquals(2, shape.length);
+        assertEquals(2, shape[0]);
+        assertEquals(3, shape[1]);
+
+        assertEquals(DataType.INT, intArray.getDataType());
+
+        assertEquals(-11, intArray.getInt(0));
+        assertEquals(-11, intArray.getInt(1));
+    }
+
+    @Test
+    public void testCreateWithFillValue_float() {
+        final Array intArray = NetCDFUtils.create(DataType.FLOAT, new int[] {3, 2}, Float.NaN);
+        final int[] shape = intArray.getShape();
+        assertEquals(2, shape.length);
+        assertEquals(3, shape[0]);
+        assertEquals(2, shape[1]);
+
+        assertEquals(DataType.FLOAT, intArray.getDataType());
+
+        assertEquals(Float.NaN, intArray.getFloat(2), 1e-8);
+        assertEquals(Float.NaN, intArray.getFloat(3), 1e-8);
+    }
 }