You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@sedona.apache.org by "jiayuasu (via GitHub)" <gi...@apache.org> on 2023/08/04 23:00:51 UTC

[GitHub] [sedona] jiayuasu commented on a diff in pull request #946: [SEDONA-343] Add RS_Contains and RS_Within

jiayuasu commented on code in PR #946:
URL: https://github.com/apache/sedona/pull/946#discussion_r1284896339


##########
common/src/main/java/org/apache/sedona/common/raster/RasterPredicates.java:
##########
@@ -46,20 +46,43 @@ public class RasterPredicates {
     public static boolean rsIntersects(GridCoverage2D raster, Geometry queryWindow) {
         Envelope2D rasterEnvelope2D = raster.getEnvelope2D();
         CoordinateReferenceSystem rasterCRS = rasterEnvelope2D.getCoordinateReferenceSystem();
-        int queryWindowSRID = queryWindow.getSRID();
-        if (rasterCRS != null && !(rasterCRS instanceof DefaultEngineeringCRS) && queryWindowSRID > 0) {
+        queryWindow = convertCRSIfNeeded(queryWindow, rasterCRS);
+        Envelope rasterEnvelope = JTS.toEnvelope(rasterEnvelope2D);
+        Geometry rasterGeometry = GEOMETRY_FACTORY.toGeometry(rasterEnvelope);
+        return rasterGeometry.intersects(queryWindow);
+    }
+
+    public static boolean rsContains(GridCoverage2D raster, Geometry geometry) {
+        Envelope2D rasterEnvelope2D = raster.getEnvelope2D();
+        CoordinateReferenceSystem rasterCRS = rasterEnvelope2D.getCoordinateReferenceSystem();
+        geometry = convertCRSIfNeeded(geometry, rasterCRS);
+        Envelope rasterEnvelope = JTS.toEnvelope(rasterEnvelope2D);
+        Geometry rasterGeometry = GEOMETRY_FACTORY.toGeometry(rasterEnvelope);
+        return  rasterGeometry.contains(geometry);
+    }
+
+    public static boolean rsWithin(GridCoverage2D raster, Geometry geometry) {
+        Envelope2D rasterEnvelope2D = raster.getEnvelope2D();
+        CoordinateReferenceSystem rasterCRS = rasterEnvelope2D.getCoordinateReferenceSystem();
+        geometry = convertCRSIfNeeded(geometry, rasterCRS);
+        Envelope rasterEnvelope = JTS.toEnvelope(rasterEnvelope2D);
+        Geometry rasterGeometry = GEOMETRY_FACTORY.toGeometry(rasterEnvelope);
+        return  rasterGeometry.within(geometry);
+    }
+
+    private static Geometry convertCRSIfNeeded(Geometry geometry, CoordinateReferenceSystem rasterCRS) {

Review Comment:
   Can you re-use the code of ST_Transform?



##########
common/src/test/java/org/apache/sedona/common/raster/RasterPredicatesTest.java:
##########
@@ -93,4 +101,188 @@ public void testIntersectsWithTransformations() {
         result = RasterPredicates.rsIntersects(raster, queryWindow);
         Assert.assertFalse(result);
     }
+
+    @Test
+    public void testContainsNoCrs() throws FactoryException {
+        Geometry geometry = GEOMETRY_FACTORY.toGeometry(new Envelope(5, 10, 5, 10));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 2, 22, 1);
+        boolean result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertTrue(result);
+
+        //overlapping raster and geometry;
+        geometry = GEOMETRY_FACTORY.toGeometry(new Envelope(2, 22, 2, 22));
+        result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertTrue(result);
+
+        //geometry protruding out of the raster envelope
+        geometry = GEOMETRY_FACTORY.toGeometry(new Envelope(2, 20, 2, 25));
+        result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testContainsGeomNoCrs() throws FactoryException {
+        Geometry geometry = GEOMETRY_FACTORY.toGeometry(new Envelope(5, 10, 5, 10));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 2, 22, 1, -1, 0, 0, 4326);
+        boolean result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertTrue(result);
+
+        //overlapping raster and geometry;
+        geometry = GEOMETRY_FACTORY.toGeometry(new Envelope(2, 22, 2, 22));
+        result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertTrue(result);
+
+        //geometry protruding out of the raster envelope
+        geometry = GEOMETRY_FACTORY.toGeometry(new Envelope(2, 20, 2, 25));
+        result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testContainsRasterNoCrs() throws FactoryException, ParseException, IOException {
+        GeometryFactory geometryFactory = new GeometryFactory(new PrecisionModel(), 4326);
+        Geometry geometry = geometryFactory.toGeometry(new Envelope(5, 10, 5, 10));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 2, 22, 1);
+        boolean result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertTrue(result);
+
+        //overlapping raster and geometry;
+        geometry = geometryFactory.toGeometry(new Envelope(2, 22, 2, 22));
+        result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertTrue(result);
+
+        //geometry protruding out of the raster envelope
+        geometry = geometryFactory.toGeometry(new Envelope(2, 20, 2, 25));
+        result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testContainsSameCrs() throws FactoryException {
+        GeometryFactory geometryFactory = new GeometryFactory(new PrecisionModel(), 4326);
+        Geometry geometry = geometryFactory.toGeometry(new Envelope(5, 10, 5, 10));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 2, 22, 1, -1, 0, 0, 4326);
+        boolean result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertTrue(result);
+
+        //overlapping raster and geometry;
+        geometry = geometryFactory.toGeometry(new Envelope(2, 22, 2, 22));
+        result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertTrue(result);
+
+        //geometry protruding out of the raster envelope
+        geometry = geometryFactory.toGeometry(new Envelope(2, 20, 2, 25));
+        result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testContainsDifferentCrs() throws FactoryException, TransformException {
+        GeometryFactory geometryFactory = new GeometryFactory(new PrecisionModel(), 3857);
+        Geometry geometry = geometryFactory.toGeometry(new Envelope(5, 10, 5, 10));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 2, 22, 1, -1, 0, 0, 3857);
+        geometry = JTS.transform(geometry, CRS.findMathTransform(raster.getCoordinateReferenceSystem(), CRS.decode("EPSG:4326")));
+        geometry.setSRID(4326);
+        boolean result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertTrue(result);
+
+        //geometry protruding out of the raster envelope
+        geometry = geometryFactory.toGeometry(new Envelope(2, 20, 2, 25));
+        geometry = JTS.transform(geometry, CRS.findMathTransform(raster.getCoordinateReferenceSystem(), CRS.decode("EPSG:4326")));
+        geometry.setSRID(4326);
+        result = RasterPredicates.rsContains(raster, geometry);
+        Assert.assertFalse(result);
+    }
+
+
+    @Test
+    public void testWithinNoCrs() throws FactoryException {
+        Geometry geometry = GEOMETRY_FACTORY.toGeometry(new Envelope(0, 100, 0, 50));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 2, 22, 1);
+        boolean result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertTrue(result);
+
+        //overlapping raster and geometry;
+        raster = RasterConstructors.makeEmptyRaster(1, 100, 50, 0, 50, 1);
+        result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertTrue(result);
+
+        //raster protruding out of the geometry
+        raster = RasterConstructors.makeEmptyRaster(1, 100, 100, 0, 50, 1);
+        result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testWithinGeomNoCrs() throws FactoryException {
+        Geometry geometry = GEOMETRY_FACTORY.toGeometry(new Envelope(0, 100, 0, 50));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 2, 22, 1, -1, 0, 0, 3857);
+        boolean result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertTrue(result);
+
+        //overlapping raster and geometry;
+        raster = RasterConstructors.makeEmptyRaster(1, 100, 50, 0, 50, 1, -1, 0, 0, 3857);
+        result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertTrue(result);
+
+        //raster protruding out of the geometry
+        raster = RasterConstructors.makeEmptyRaster(1, 100, 100, 0, 50, 1, -1, 0, 0, 3857);
+        result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testWithinRasterNoCrs() throws FactoryException {
+        GeometryFactory geometryFactory = new GeometryFactory(new PrecisionModel(), 4326);
+        Geometry geometry = geometryFactory.toGeometry(new Envelope(0, 100, 0, 50));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 2, 22, 1);
+        boolean result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertTrue(result);
+
+        //overlapping raster and geometry;
+        raster = RasterConstructors.makeEmptyRaster(1, 100, 50, 0, 50, 1);
+        result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertTrue(result);
+
+        //raster protruding out of the geometry
+        raster = RasterConstructors.makeEmptyRaster(1, 100, 100, 0, 50, 1);
+        result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testWithinSameCrs() throws FactoryException {
+        GeometryFactory geometryFactory = new GeometryFactory(new PrecisionModel(), 4326);
+        Geometry geometry = geometryFactory.toGeometry(new Envelope(0, 100, 0, 50));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 2, 22, 1, -1, 0, 0, 4326);
+        boolean result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertTrue(result);
+
+        //overlapping raster and geometry;
+        raster = RasterConstructors.makeEmptyRaster(1, 100, 50, 0, 50, 1, -1, 0, 0, 4326);
+        result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertTrue(result);
+
+        //raster protruding out of the geometry
+        raster = RasterConstructors.makeEmptyRaster(1, 100, 100, 0, 50, 1, -1, 0, 0, 4326);
+        result = RasterPredicates.rsWithin(raster, geometry);
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testWithinDifferentCrs() throws FactoryException, TransformException {
+        GeometryFactory geometryFactory = new GeometryFactory(new PrecisionModel(), 4326);
+        Geometry geometry = geometryFactory.toGeometry(new Envelope(30, 60, 10, 50));
+        GridCoverage2D raster = RasterConstructors.makeEmptyRaster(1, 20, 20, 32, 35, 1, -1, 0, 0, 4326);
+        geometry = JTS.transform(geometry, CRS.findMathTransform(raster.getCoordinateReferenceSystem(), CRS.decode("EPSG:3857")));

Review Comment:
   Try to re-use the code from ST_Transform



##########
common/src/main/java/org/apache/sedona/common/raster/RasterPredicates.java:
##########
@@ -46,20 +46,43 @@ public class RasterPredicates {
     public static boolean rsIntersects(GridCoverage2D raster, Geometry queryWindow) {
         Envelope2D rasterEnvelope2D = raster.getEnvelope2D();
         CoordinateReferenceSystem rasterCRS = rasterEnvelope2D.getCoordinateReferenceSystem();
-        int queryWindowSRID = queryWindow.getSRID();
-        if (rasterCRS != null && !(rasterCRS instanceof DefaultEngineeringCRS) && queryWindowSRID > 0) {
+        queryWindow = convertCRSIfNeeded(queryWindow, rasterCRS);
+        Envelope rasterEnvelope = JTS.toEnvelope(rasterEnvelope2D);
+        Geometry rasterGeometry = GEOMETRY_FACTORY.toGeometry(rasterEnvelope);
+        return rasterGeometry.intersects(queryWindow);
+    }
+
+    public static boolean rsContains(GridCoverage2D raster, Geometry geometry) {
+        Envelope2D rasterEnvelope2D = raster.getEnvelope2D();
+        CoordinateReferenceSystem rasterCRS = rasterEnvelope2D.getCoordinateReferenceSystem();
+        geometry = convertCRSIfNeeded(geometry, rasterCRS);
+        Envelope rasterEnvelope = JTS.toEnvelope(rasterEnvelope2D);
+        Geometry rasterGeometry = GEOMETRY_FACTORY.toGeometry(rasterEnvelope);
+        return  rasterGeometry.contains(geometry);
+    }
+
+    public static boolean rsWithin(GridCoverage2D raster, Geometry geometry) {
+        Envelope2D rasterEnvelope2D = raster.getEnvelope2D();
+        CoordinateReferenceSystem rasterCRS = rasterEnvelope2D.getCoordinateReferenceSystem();
+        geometry = convertCRSIfNeeded(geometry, rasterCRS);
+        Envelope rasterEnvelope = JTS.toEnvelope(rasterEnvelope2D);
+        Geometry rasterGeometry = GEOMETRY_FACTORY.toGeometry(rasterEnvelope);
+        return  rasterGeometry.within(geometry);
+    }
+
+    private static Geometry convertCRSIfNeeded(Geometry geometry, CoordinateReferenceSystem rasterCRS) {

Review Comment:
   Is the order lon/lat or lat/lon?



##########
common/src/main/java/org/apache/sedona/common/raster/RasterPredicates.java:
##########
@@ -46,20 +46,43 @@ public class RasterPredicates {
     public static boolean rsIntersects(GridCoverage2D raster, Geometry queryWindow) {
         Envelope2D rasterEnvelope2D = raster.getEnvelope2D();
         CoordinateReferenceSystem rasterCRS = rasterEnvelope2D.getCoordinateReferenceSystem();
-        int queryWindowSRID = queryWindow.getSRID();
-        if (rasterCRS != null && !(rasterCRS instanceof DefaultEngineeringCRS) && queryWindowSRID > 0) {
+        queryWindow = convertCRSIfNeeded(queryWindow, rasterCRS);
+        Envelope rasterEnvelope = JTS.toEnvelope(rasterEnvelope2D);
+        Geometry rasterGeometry = GEOMETRY_FACTORY.toGeometry(rasterEnvelope);
+        return rasterGeometry.intersects(queryWindow);
+    }
+
+    public static boolean rsContains(GridCoverage2D raster, Geometry geometry) {
+        Envelope2D rasterEnvelope2D = raster.getEnvelope2D();
+        CoordinateReferenceSystem rasterCRS = rasterEnvelope2D.getCoordinateReferenceSystem();
+        geometry = convertCRSIfNeeded(geometry, rasterCRS);
+        Envelope rasterEnvelope = JTS.toEnvelope(rasterEnvelope2D);
+        Geometry rasterGeometry = GEOMETRY_FACTORY.toGeometry(rasterEnvelope);
+        return  rasterGeometry.contains(geometry);
+    }
+
+    public static boolean rsWithin(GridCoverage2D raster, Geometry geometry) {
+        Envelope2D rasterEnvelope2D = raster.getEnvelope2D();
+        CoordinateReferenceSystem rasterCRS = rasterEnvelope2D.getCoordinateReferenceSystem();
+        geometry = convertCRSIfNeeded(geometry, rasterCRS);
+        Envelope rasterEnvelope = JTS.toEnvelope(rasterEnvelope2D);
+        Geometry rasterGeometry = GEOMETRY_FACTORY.toGeometry(rasterEnvelope);
+        return  rasterGeometry.within(geometry);
+    }
+
+    private static Geometry convertCRSIfNeeded(Geometry geometry, CoordinateReferenceSystem rasterCRS) {
+        int geomSRID = geometry.getSRID();
+        if (rasterCRS != null && !(rasterCRS instanceof DefaultEngineeringCRS) && geomSRID > 0) {

Review Comment:
   Is the DefaultEngineeringCRS default or DefaultCartisian2D? 



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@sedona.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org