Merge pull request #10 from bcdev/TB_windsat

Tb windsat

Author: TomBlock

CHANGES.md

@@ -1,3 +1,6 @@
+### Updates from version 1.5.6 to 1.5.7
+* added support for Windsat Coriolis data
+
 ### Updates from version 1.5.6 to 1.5.7
 * added support for SMOS L1C daily aggregated products
 * added support for SIC-CCI RRDP insitu data

core/src/main/java/com/bc/fiduceo/geometry/GeometryUtil.java

@@ -21,6 +21,7 @@
 package com.bc.fiduceo.geometry;
 
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class GeometryUtil {
@@ -33,13 +34,57 @@ public static Geometry[] getSubGeometries(Geometry composedGeometry) {
         } else if (composedGeometry instanceof MultiPolygon) {
             final MultiPolygon observationMultiPolygon = (MultiPolygon) composedGeometry;
             final List<Polygon> polygons = observationMultiPolygon.getPolygons();
-            geometries = polygons.toArray(new Geometry[polygons.size()]);
+            geometries = polygons.toArray(new Geometry[0]);
         } else {
             geometries = new Geometry[]{composedGeometry};
         }
         return geometries;
     }
 
+    public static Polygon createPolygonFromMinMax(double[] geoMinMax, GeometryFactory geometryFactory) {
+        final double lonMin = geoMinMax[0];
+        final double lonMax = geoMinMax[1];
+        final double latMin = geoMinMax[2];
+        final double latMax = geoMinMax[3];
+
+        final Point ll = geometryFactory.createPoint(lonMin, latMin);
+        final Point ul = geometryFactory.createPoint(lonMin, latMax);
+        final Point ur = geometryFactory.createPoint(lonMax, latMax);
+        final Point lr = geometryFactory.createPoint(lonMax, latMin);
+        final ArrayList<Point> polygonPoints = new ArrayList<>();
+        polygonPoints.add(ll);
+        polygonPoints.add(lr);
+        polygonPoints.add(ur);
+        polygonPoints.add(ul);
+        polygonPoints.add(ll);
+        return geometryFactory.createPolygon(polygonPoints);
+    }
+
+    public static MultiLineString createMultiLineStringFromMinMax(double[] geoMinMax, GeometryFactory geometryFactory) {
+        final double lonMin = geoMinMax[0];
+        final double lonMax = geoMinMax[1];
+
+        final double latMin = geoMinMax[2];
+        final double latMax = geoMinMax[3];
+
+        final List<Point> points = new ArrayList<>();
+        points.add(geometryFactory.createPoint(lonMin, 0.0));
+        points.add(geometryFactory.createPoint(lonMax, 0.0));
+        final LineString we = geometryFactory.createLineString(points);
+
+        points.clear();
+        points.add(geometryFactory.createPoint(0.0, latMax));
+        points.add(geometryFactory.createPoint(0.0, latMin));
+
+        final LineString ns = geometryFactory.createLineString(points);
+
+        final List<LineString> lines = new ArrayList<>();
+        lines.add(we);
+        lines.add(ns);
+
+        return geometryFactory.createMultiLineString(lines);
+    }
+
     public static String toKml(Polygon polygon) {
         final StringBuilder builder = new StringBuilder();
 
@@ -103,14 +148,14 @@ public static String toKml(float[] lats, float[] lons) {
         for (int i = 0; i < lats.length; i++) {
             final float lat = lats[i];
             final float lon = lons[i];
-            if (lat != latBefore || lon != lonBefore || i == lats.length -1 ) {
+            if (lat != latBefore || lon != lonBefore || i == lats.length - 1) {
                 builder.append("  <Placemark>\n");
-                builder.append("    <name>"+count+"</name>\n");
+                builder.append("    <name>" + count + "</name>\n");
                 builder.append("    <Point><coordinates>");
                 builder.append(lonBefore);
                 builder.append(",");
                 builder.append(latBefore);
-    //            builder.append(",0");
+                //            builder.append(",0");
                 builder.append("</coordinates>");
                 builder.append("</Point>\n");
                 builder.append("  </Placemark>\n");

…uceo/reader/smos/RasterPixelLocator.java …fiduceo/location/RasterPixelLocator.javacore/src/main/java/com/bc/fiduceo/reader/smos/RasterPixelLocator.java renamed to core/src/main/java/com/bc/fiduceo/location/RasterPixelLocator.java core/src/main/java/com/bc/fiduceo/reader/smos/RasterPixelLocator.java renamed to core/src/main/java/com/bc/fiduceo/location/RasterPixelLocator.java

@@ -1,15 +1,17 @@
-package com.bc.fiduceo.reader.smos;
-
-import com.bc.fiduceo.location.PixelLocator;
+package com.bc.fiduceo.location;
 
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
-class RasterPixelLocator implements PixelLocator {
+public class RasterPixelLocator implements PixelLocator {
+
+    public static int LON_WEST_EAST = 0;
+    public static int LON_EAST_WEST = 1;
 
     private final float[] lons;
     private final float[] lats;
     private final Rectangle2D.Float boundary;
+    private final int lonDirection;
 
     /**
      * Pixel locator for rectangular rasters, lon and lat axes supplied as vectors.
@@ -21,10 +23,16 @@ class RasterPixelLocator implements PixelLocator {
      * @param lats     the latitude axis
      * @param boundary the raster boundaries
      */
-    RasterPixelLocator(float[] lons, float[] lats, Rectangle2D.Float boundary) {
+    // @todo 1 tb/tb add option to flip axes (at least lon for now) 2022-11-23
+    public RasterPixelLocator(float[] lons, float[] lats, Rectangle2D.Float boundary) {
+        this(lons, lats, boundary, LON_WEST_EAST);
+    }
+
+    public RasterPixelLocator(float[] lons, float[] lats, Rectangle2D.Float boundary, int lonDirection) {
         this.lons = lons;
         this.lats = lats;
         this.boundary = boundary;
+        this.lonDirection = lonDirection;
     }
 
     @Override
@@ -53,7 +61,12 @@ public Point2D[] getPixelLocation(double lon, double lat) {
             return new Point2D[0];
         }
 
-        int x_break = getIndexLargerThan(lon, lons);
+        int x_break;
+        if (lonDirection == LON_EAST_WEST) {
+            x_break = getIndexSmallerThan(lon, lons);
+        } else {
+            x_break = getIndexLargerThan(lon, lons);
+        }
         x_break = adjustForClosest(x_break, lon, lons);
 
         int y_break = getIndexLargerThan(lat, lats);
@@ -77,7 +90,7 @@ private static int adjustForClosest(int targetIndex, double location, float[] lo
         return targetIndex;
     }
 
-    private static int getIndexLargerThan(double location, float[] locations) {
+    static int getIndexLargerThan(double location, float[] locations) {
         int x_break = -1;
         for (int i = 0; i < locations.length; i++) {
             if (location <= locations[i]) {
@@ -87,4 +100,17 @@ private static int getIndexLargerThan(double location, float[] locations) {
         }
         return x_break;
     }
+
+    static int getIndexSmallerThan(double location, float[] locations) {
+        int x_break = -1;
+
+        for (int i = 0; i < locations.length; i++) {
+            if (location >= locations[i]) {
+                x_break = i;
+                break;
+            }
+        }
+
+        return x_break;
+    }
 }

core/src/main/java/com/bc/fiduceo/reader/ReaderUtils.java

@@ -20,12 +20,18 @@
 
 package com.bc.fiduceo.reader;
 
+import com.bc.fiduceo.core.Dimension;
+import com.bc.fiduceo.core.Interval;
 import com.bc.fiduceo.geometry.*;
 import com.bc.fiduceo.math.TimeInterval;
+import com.bc.fiduceo.reader.time.TimeLocator;
 import com.bc.fiduceo.util.NetCDFUtils;
 import org.esa.snap.core.datamodel.ProductData;
 import org.esa.snap.core.util.io.FileUtils;
+import ucar.ma2.Array;
+import ucar.ma2.ArrayInt;
 import ucar.ma2.DataType;
+import ucar.ma2.Index;
 
 import java.io.*;
 import java.util.Date;
@@ -111,7 +117,7 @@ public static int getChannelIndex(String variableName) {
 
     public static boolean isCompressed(File file) {
         final String extension = FileUtils.getExtension(file);
-        return extension.equalsIgnoreCase(".gz") || extension.equalsIgnoreCase(".tgz")|| extension.equalsIgnoreCase(".zip");
+        return extension.equalsIgnoreCase(".gz") || extension.equalsIgnoreCase(".tgz") || extension.equalsIgnoreCase(".zip");
     }
 
     /**
@@ -132,4 +138,44 @@ public static void decompress(File gzipFile, File tmpFile) throws IOException {
             }
         }
     }
+
+    public static ArrayInt.D2 readAcquisitionTimeFromTimeLocator(int x, int y, Interval interval, Dimension productSize, TimeLocator timeLocator) {
+        final int height = interval.getY();
+        final int width = interval.getX();
+        final int x_offset = x - width / 2;
+        final int y_offset = y - height / 2;
+        int[] shape = new int[]{height, width};
+
+        final int pWidth = productSize.getNx();
+        final int pHeight = productSize.getNy();
+
+        final int acquisitionTimeFillValue = getDefaultFillValue(ProductData.TYPE_INT32).intValue();
+
+        final ArrayInt.D2 acquisitionTime = (ArrayInt.D2) Array.factory(DataType.INT, shape);
+        final Index index = acquisitionTime.getIndex();
+
+        for (int ya = 0; ya < height; ya++) {
+            final int yRead = y_offset + ya;
+
+            for (int xa = 0; xa < width; xa++) {
+                final int xRead = x_offset + xa;
+
+                int acTime;
+                if (xRead < 0 || xRead >= pWidth || yRead < 0 || yRead >= pHeight) {
+                    acTime = acquisitionTimeFillValue;
+                } else {
+                    final long pxTime = timeLocator.getTimeFor(xRead, yRead);
+                    if (pxTime < 0) {
+                        acTime = acquisitionTimeFillValue;
+                    } else {
+                        acTime = (int) (pxTime / 1000);
+                    }
+                }
+                index.set(ya, xa);
+                acquisitionTime.setInt(index, acTime);
+            }
+        }
+
+        return acquisitionTime;
+    }
 }

core/src/main/java/com/bc/fiduceo/reader/modis/MxD021KM_Reader.java

@@ -17,8 +17,8 @@
 import com.bc.fiduceo.reader.time.TimeLocator_TAI1993Scan;
 import com.bc.fiduceo.util.NetCDFUtils;
 import org.esa.snap.core.util.StringUtils;
-import ucar.ma2.*;
 import ucar.ma2.DataType;
+import ucar.ma2.*;
 import ucar.nc2.Attribute;
 import ucar.nc2.AttributeContainer;
 import ucar.nc2.Structure;
@@ -246,11 +246,7 @@ public List<Variable> getVariables() throws InvalidRangeException, IOException {
             }
 
             if (variableName.contains("EV_1KM_RefSB")) {
-                final ArrayList<Variable> bandVariables = new ArrayList<>(NUM_1KM_REF_CHAN);
-
-                addLayered3DVariables(bandVariables, variable, NUM_1KM_REF_CHAN, variableName, new ModisL1ReflectiveExtension());
-
-                exportVariables.addAll(bandVariables);
+                addLayered3DVariables(exportVariables, variable, NUM_1KM_REF_CHAN, variableName, new ModisL1ReflectiveExtension());
                 continue;
             }