Merge pull request #8 from bcdev/TB_smos_gridded_daily

Tb smos gridded daily

Author: TomBlock

core/pom.xml

@@ -57,6 +57,12 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -112,6 +118,7 @@
             <artifactId>jimfs</artifactId>
             <scope>test</scope>
         </dependency>
+        
     </dependencies>
 
     <build>

core/src/main/java/com/bc/fiduceo/db/H2Driver.java

@@ -23,9 +23,7 @@
 import com.bc.fiduceo.core.NodeType;
 import com.bc.fiduceo.core.SatelliteObservation;
 import com.bc.fiduceo.core.Sensor;
-import com.bc.fiduceo.geometry.GeometryFactory;
-import com.bc.fiduceo.geometry.LineString;
-import com.bc.fiduceo.geometry.TimeAxis;
+import com.bc.fiduceo.geometry.*;
 import com.bc.fiduceo.util.TimeUtils;
 
 import java.sql.*;
@@ -192,7 +190,7 @@ public List<SatelliteObservation> get(QueryParameter parameter) throws SQLExcept
             }
             resultSet.previous();   // need to rewind one result because the while loop runs one result too far tb 2016-09-23
 
-            observation.setTimeAxes(timeAxesList.toArray(new TimeAxis[timeAxesList.size()]));
+            observation.setTimeAxes(timeAxesList.toArray(new TimeAxis[0]));
 
             resultList.add(observation);
         }
@@ -205,13 +203,19 @@ private TimeAxis getTimeAxis(ResultSet resultSet) throws SQLException {
         if (axis == null) {
             return null;
         }
-        final String axisWkt = axis.toString();
-        final LineString axisGeometry = (LineString) geometryFactory.fromStorageFormat(axisWkt.getBytes());
 
         final Timestamp startTime = resultSet.getTimestamp("StartTime");
         final Date axisStartTime = TimeUtils.toDate(startTime);
         final Timestamp endTime = resultSet.getTimestamp("StopTime");
         final Date axisEndTime = TimeUtils.toDate(endTime);
-        return geometryFactory.createTimeAxis(axisGeometry, axisStartTime, axisEndTime);
+
+        final String axisWkt = axis.toString();
+        final Geometry geometry = geometryFactory.fromStorageFormat(axisWkt.getBytes());
+        if (geometry instanceof MultiLineString) {
+            return new L3TimeAxis(axisStartTime, axisEndTime, geometry);
+        } else {
+            final LineString axisGeometry = (LineString) geometry;
+            return geometryFactory.createTimeAxis(axisGeometry, axisStartTime, axisEndTime);
+        }
     }
 }

core/src/main/java/com/bc/fiduceo/db/MongoDbDriver.java

@@ -289,6 +289,8 @@ Geometry convertToGeometry(Document geoDocument) {
             return convertGeometryCollection(geoDocument);
         } else if ("LineString".equals(type)) {
             return convertLineString(geoDocument);
+        } else if ("MultiLineString".equals(type)) {
+            return convertMultiLineString(geoDocument);
         }
         throw new RuntimeException("Geometry type support not implemented yet: " + type);
     }
@@ -303,13 +305,13 @@ private Geometry convertGeometryCollection(Document geoDocument) {
     }
 
     private Geometry convertMultiPolygon(Document geoDocument) {
-        List<Polygon> polygonList = new ArrayList<>();
-        ArrayList polycoordinates = (ArrayList) geoDocument.get("coordinates");
-        for (Object polycoordinate : polycoordinates) {
+        final List<Polygon> polygonList = new ArrayList<>();
+        final ArrayList polyCoordinates = (ArrayList) geoDocument.get("coordinates");
+        for (Object polycoordinate : polyCoordinates) {
             final ArrayList coordinates = (ArrayList) polycoordinate;
             for (Object coordinate : coordinates) {
                 final ArrayList<Double> point = (ArrayList<Double>) coordinate;
-                List<Point> pointList = new ArrayList<>();
+                final List<Point> pointList = new ArrayList<>();
                 for (Object object : point) {
                     ArrayList<Double> m = (ArrayList<Double>) object;
                     pointList.add(geometryFactory.createPoint(m.get(0), m.get(1)));
@@ -344,6 +346,21 @@ private Geometry convertLineString(Document geoDocument) {
         return geometryFactory.createLineString(lineStringPoints);
     }
 
+    private Geometry convertMultiLineString(Document geoDocument) {
+        final List<LineString> lineStrings = new ArrayList<>();
+
+        final List<List<List<Double>>> coordinates = (List<List<List<Double>>>) geoDocument.get("coordinates");
+        for (final List<List<Double>> positionList : coordinates) {
+            final ArrayList<Point> lineStringPoints = new ArrayList<>();
+            for (final List<Double> position : positionList) {
+                final Point point = geometryFactory.createPoint(position.get(0), position.get(1));
+                lineStringPoints.add(point);
+            }
+            lineStrings.add(geometryFactory.createLineString(lineStringPoints));
+        }
+        return geometryFactory.createMultiLineString(lineStrings);
+    }
+
     // @todo 2 tb/** make static and add tests 2016-04-21
     TimeAxis[] convertToTimeAxes(Document jsonTimeAxes) {
         final List<Document> timeAxesDocuments = (List<Document>) jsonTimeAxes.get("timeAxes");
@@ -352,8 +369,16 @@ TimeAxis[] convertToTimeAxes(Document jsonTimeAxes) {
             final Document timeAxisDocument = timeAxesDocuments.get(i);
             final Date startTime = timeAxisDocument.getDate("startTime");
             final Date endTime = timeAxisDocument.getDate("endTime");
-            final LineString geometry = (LineString) convertToGeometry((Document) timeAxisDocument.get("geometry"));
-            timeAxes[i] = geometryFactory.createTimeAxis(geometry, startTime, endTime);
+            // check geometry type and either create standard time axis or the L3 thing
+            final Document geoDocument = (Document) timeAxisDocument.get("geometry");
+            final String type = (String) geoDocument.get("type");
+            if (type.equals("MultiLineString")) {
+                final MultiLineString geometry = (MultiLineString) convertToGeometry(geoDocument);
+                timeAxes[i] = new L3TimeAxis(startTime, endTime, geometry);
+            } else {
+                final LineString geometry = (LineString) convertToGeometry(geoDocument);
+                timeAxes[i] = geometryFactory.createTimeAxis(geometry, startTime, endTime);
+            }
         }
         return timeAxes;
     }
@@ -412,7 +437,9 @@ static Document createQueryDocument(QueryParameter parameter) {
     // static access for testing only tb 2016-02-09
     @SuppressWarnings("unchecked")
     static com.mongodb.client.model.geojson.Geometry convertToGeoJSON(Geometry geometry) {
-        if (geometry instanceof GeometryCollection) {
+        if (geometry instanceof MultiLineString) {
+            return convertMultiLineStringToGeoJSON((MultiLineString) geometry);
+        } else if (geometry instanceof GeometryCollection) {
             return convertGeometryCollectionToGeoJSON((GeometryCollection) geometry);
         }
 
@@ -461,6 +488,24 @@ private static com.mongodb.client.model.geojson.Geometry convertGeometryCollecti
         return new com.mongodb.client.model.geojson.GeometryCollection(geometryList);
     }
 
+    private static com.mongodb.client.model.geojson.Geometry convertMultiLineStringToGeoJSON(MultiLineString multiLineString) {
+        final Geometry[] geometries = multiLineString.getGeometries();
+        if (geometries.length == 1) {
+            return convertToGeoJSON(geometries[0]);
+        }
+
+        final List<List<Position>> multiList = new ArrayList<>();
+        for (final Geometry geometry : geometries) {
+            final List<Position> lineStringPoints = new ArrayList<>();
+            final Point[] coordinates = geometry.getCoordinates();
+            for (final Point point : coordinates) {
+                lineStringPoints.add(new Position(point.getLon(), point.getLat()));
+            }
+            multiList.add(lineStringPoints);
+        }
+        return new com.mongodb.client.model.geojson.MultiLineString(multiList);
+    }
+
     private static ArrayList<Position> extractPointsFromGeometry(Point[] coordinates) {
         final ArrayList<Position> polygonPoints = new ArrayList<>();
 

core/src/main/java/com/bc/fiduceo/db/PostGISDriver.java

@@ -23,10 +23,7 @@
 import com.bc.fiduceo.core.NodeType;
 import com.bc.fiduceo.core.SatelliteObservation;
 import com.bc.fiduceo.core.Sensor;
-import com.bc.fiduceo.geometry.Geometry;
-import com.bc.fiduceo.geometry.GeometryFactory;
-import com.bc.fiduceo.geometry.LineString;
-import com.bc.fiduceo.geometry.TimeAxis;
+import com.bc.fiduceo.geometry.*;
 import com.bc.fiduceo.util.TimeUtils;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.esa.snap.core.util.StringUtils;
@@ -282,13 +279,19 @@ private TimeAxis getTimeAxis(ResultSet resultSet) throws SQLException {
         if (axis == null) {
             return null;
         }
-        final String axisWkt = axis.getValue();
-        final LineString axisGeometry = (LineString) geometryFactory.fromStorageFormat(axisWkt.getBytes());
 
         final Timestamp startTime = resultSet.getTimestamp("StartTime");
         final java.util.Date axisStartTime = TimeUtils.toDate(startTime);
         final Timestamp endTime = resultSet.getTimestamp("StopTime");
         final java.util.Date axisEndTime = TimeUtils.toDate(endTime);
-        return geometryFactory.createTimeAxis(axisGeometry, axisStartTime, axisEndTime);
+
+        final String axisWkt = axis.getValue();
+        final Geometry geometry = geometryFactory.fromStorageFormat(axisWkt.getBytes());
+        if (geometry instanceof MultiLineString) {
+            return new L3TimeAxis(axisStartTime, axisEndTime, geometry);
+        } else {
+            final LineString axisGeometry = (LineString) geometry;
+            return geometryFactory.createTimeAxis(axisGeometry, axisStartTime, axisEndTime);
+        }
     }
 }

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

@@ -80,14 +80,19 @@ public Polygon createPolygon(List<Point> points) {
         return factoryImpl.createPolygon(points);
     }
 
+    @Override
+    public MultiPolygon createMultiPolygon(List<Polygon> polygonList) {
+        return factoryImpl.createMultiPolygon(polygonList);
+    }
+
     @Override
     public LineString createLineString(List<Point> points) {
         return factoryImpl.createLineString(points);
     }
 
     @Override
-    public MultiPolygon createMultiPolygon(List<Polygon> polygonList) {
-        return factoryImpl.createMultiPolygon(polygonList);
+    public MultiLineString createMultiLineString(List<LineString> lineStrings) {
+        return factoryImpl.createMultiLineString(lineStrings);
     }
 
     @Override

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

@@ -39,6 +39,8 @@ public interface GeometryFactoryInterface {
 
     LineString createLineString(List<Point> points);
 
+    MultiLineString createMultiLineString(List<LineString> points);
+
     MultiPolygon createMultiPolygon(List<Polygon> polygonList);
 
     TimeAxis createTimeAxis(LineString lineString, Date startTime, Date endTime);

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

@@ -0,0 +1,55 @@
+package com.bc.fiduceo.geometry;
+
+import com.bc.fiduceo.math.TimeInterval;
+
+import java.util.Date;
+
+public class L3TimeAxis implements TimeAxis {
+
+    private final Date startDate;
+    private final Date stopDate;
+    private final Geometry geometry;
+
+    public L3TimeAxis(Date startDate, Date stopDate, Geometry geometry) {
+        this.startDate = startDate;
+        this.stopDate = stopDate;
+        this.geometry = geometry;
+    }
+
+    @Override
+    public TimeInterval getIntersectionTime(Polygon polygon) {
+        return new TimeInterval(startDate, stopDate);
+    }
+
+    @Override
+    public TimeInterval getProjectionTime(LineString polygonSide) {
+        return new TimeInterval(startDate, stopDate);
+    }
+
+    @Override
+    public Date getTime(Point coordinate) {
+        final long avgTime = (stopDate.getTime() + startDate.getTime()) / 2;
+
+        return new Date(avgTime);
+    }
+
+    @Override
+    public Date getStartTime() {
+        return startDate;
+    }
+
+    @Override
+    public Date getEndTime() {
+        return stopDate;
+    }
+
+    @Override
+    public Geometry getGeometry() {
+        return geometry;
+    }
+
+    @Override
+    public long getDurationInMillis() {
+        return stopDate.getTime() - startDate.getTime();
+    }
+}

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

@@ -21,5 +21,5 @@
 package com.bc.fiduceo.geometry;
 
 
-public interface MultiLineString extends LineString {
+public interface MultiLineString extends GeometryCollection {
 }

core/src/main/java/com/bc/fiduceo/geometry/jts/JTSLineString.java

@@ -47,7 +47,7 @@ public boolean isEmpty() {
 
     @Override
     public boolean isValid() {
-        throw new RuntimeException("not implemented");
+        return jtsLineString.isValid();
     }
 
     @Override

core/src/main/java/com/bc/fiduceo/geometry/jts/JTSMultiLineString.java

@@ -0,0 +1,54 @@
+package com.bc.fiduceo.geometry.jts;
+
+import com.bc.fiduceo.geometry.Geometry;
+import com.bc.fiduceo.geometry.MultiLineString;
+import com.bc.fiduceo.geometry.Point;
+
+public class JTSMultiLineString implements MultiLineString {
+
+    private final com.vividsolutions.jts.geom.MultiLineString jtsMultiLineString;
+
+    public JTSMultiLineString(com.vividsolutions.jts.geom.MultiLineString jtsMultiLineString) {
+        this.jtsMultiLineString = jtsMultiLineString;
+    }
+
+    @Override
+    public Geometry[] getGeometries() {
+        throw new RuntimeException("not implemented");
+    }
+
+    @Override
+    public void setGeometries(Geometry[] geometries) {
+        throw new RuntimeException("not implemented");
+    }
+
+    @Override
+    public Geometry getIntersection(Geometry other) {
+        throw new RuntimeException("not implemented");
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return jtsMultiLineString.isEmpty();
+    }
+
+    @Override
+    public boolean isValid() {
+        return jtsMultiLineString.isValid();
+    }
+
+    @Override
+    public Point[] getCoordinates() {
+        return new Point[0];
+    }
+
+    @Override
+    public String toString() {
+        return jtsMultiLineString.toString();
+    }
+
+    @Override
+    public Object getInner() {
+        return null;
+    }
+}