Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SEDONA-338] Don't change the geo-referencing data when setting the SRID of rasters. #955

Merged
merged 1 commit into from
Aug 9, 2023
Merged

[SEDONA-338] Don't change the geo-referencing data when setting the SRID of rasters. #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions common/src/main/java/org/apache/sedona/common/raster/RasterEditors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@
import org.geotools.coverage.CoverageFactoryFinder;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.grid.GridCoverageFactory;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.referencing.CRS;
import org.geotools.referencing.crs.DefaultEngineeringCRS;
import org.opengis.coverage.grid.GridCoverage;
import org.opengis.referencing.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform2D;

import java.util.Map;

public class RasterEditors
{
Expand All @@ -37,8 +40,11 @@ public static GridCoverage2D setSrid(GridCoverage2D raster, int srid) throws Fac
} else {
crs = CRS.decode("EPSG:" + srid);
}
ReferencedEnvelope referencedEnvelope = new ReferencedEnvelope(raster.getEnvelope2D(), crs);

GridCoverageFactory gridCoverageFactory = CoverageFactoryFinder.getGridCoverageFactory(null);
return gridCoverageFactory.create(raster.getName().toString(), raster.getRenderedImage(), referencedEnvelope);
MathTransform2D transform = raster.getGridGeometry().getGridToCRS2D();
Map<?, ?> properties = raster.getProperties();
GridCoverage[] sources = raster.getSources().toArray(new GridCoverage[0]);
return gridCoverageFactory.create(raster.getName().toString(), raster.getRenderedImage(), crs, transform, raster.getSampleDimensions(), sources, properties);
}
}
11 changes: 11 additions & 0 deletions common/src/test/java/org/apache/sedona/common/raster/FunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
*/
package org.apache.sedona.common.raster;

import org.apache.sedona.common.utils.RasterUtils;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.referencing.operation.transform.AffineTransform2D;
import org.junit.Assert;
import org.junit.Test;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
Expand Down Expand Up @@ -41,8 +44,16 @@ public void testSetSrid() throws FactoryException {
assertEquals(4326, GeometryFunctions.envelope(oneBandRasterWithUpdatedSrid).getSRID());
assertTrue(GeometryFunctions.envelope(oneBandRasterWithUpdatedSrid).equalsTopo(GeometryFunctions.envelope(oneBandRaster)));

AffineTransform2D oneBandAffine = RasterUtils.getGDALAffineTransform(oneBandRaster);
AffineTransform2D oneBandUpdatedAffine = RasterUtils.getGDALAffineTransform(oneBandRasterWithUpdatedSrid);
Assert.assertEquals(oneBandAffine, oneBandUpdatedAffine);

GridCoverage2D multiBandRasterWithUpdatedSrid = RasterEditors.setSrid(multiBandRaster, 0);
assertEquals(0 , RasterAccessors.srid(multiBandRasterWithUpdatedSrid));

AffineTransform2D multiBandAffine = RasterUtils.getGDALAffineTransform(multiBandRaster);
AffineTransform2D multiBandUpdatedAffine = RasterUtils.getGDALAffineTransform(multiBandRasterWithUpdatedSrid);
Assert.assertEquals(multiBandAffine, multiBandUpdatedAffine);
}

@Test
Expand Down
18 changes: 16 additions & 2 deletions sql/common/src/test/scala/org/apache/sedona/sql/rasteralgebraTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,22 @@ class rasteralgebraTest extends TestBaseScala with BeforeAndAfter with GivenWhen

it("Passed RS_SetSRID with raster") {
val df = sparkSession.read.format("binaryFile").load(resourceFolder + "raster/test1.tiff")
val result = df.selectExpr("RS_SRID(RS_SetSRID(RS_FromGeoTiff(content), 4326))").first().getInt(0)
assert(result == 4326)
val dfRaster = df.selectExpr("RS_FromGeoTiff(content) as rast", "RS_SetSRID(RS_FromGeoTiff(content), 4326) as rast_4326")
val dfResult = dfRaster.selectExpr("RS_SRID(rast_4326) as srid_4326", "RS_Metadata(rast) as metadata", "RS_Metadata(rast_4326) as metadata_4326")
val result = dfResult.first()
assert(result.getInt(0) == 4326)
val metadata = result.getSeq[Double](1)
val metadata4326 = result.getSeq[Double](2)
assert(metadata4326(8) == 4326)
assert(metadata(0) == metadata4326(0))
assert(metadata(1) == metadata4326(1))
assert(metadata(2) == metadata4326(2))
assert(metadata(3) == metadata4326(3))
assert(metadata(4) == metadata4326(4))
assert(metadata(5) == metadata4326(5))
assert(metadata(6) == metadata4326(6))
assert(metadata(7) == metadata4326(7))
assert(metadata(9) == metadata4326(9))
}

it("Passed RS_SRID should handle null values") {
Expand Down