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

Jump to bottom

[SEDONA-319] Make result of RS_BandAsArray serializable #899

Merged
merged 2 commits into from
Jul 12, 2023
Merged

[SEDONA-319] Make result of RS_BandAsArray serializable #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ecf6ca
Add a test case which reproduces this issue
Kontinuation Jul 7, 2023
060b7d8
Fixed the color model serialization problem by manually constructing …
Kontinuation Jul 12, 2023
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
35 changes: 31 additions & 4 deletions common/src/main/java/org/apache/sedona/common/raster/MapAlgebra.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,25 @@
*/
package org.apache.sedona.common.raster;

import com.sun.media.imageioimpl.common.BogusColorSpace;
import org.geotools.coverage.CoverageFactoryFinder;
import org.geotools.coverage.GridSampleDimension;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.grid.GridCoverageFactory;

import javax.media.jai.RasterFactory;

import java.awt.Point;
import java.awt.Transparency;
import java.awt.color.ColorSpace;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.ComponentColorModel;
import java.awt.image.DataBuffer;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
import java.awt.image.WritableRaster;
import java.util.Arrays;

public class MapAlgebra
{
Expand Down Expand Up @@ -118,9 +127,14 @@ private static GridCoverage2D copyRasterAndAppendBand(GridCoverage2D gridCoverag
wr.setPixel(i, j, copiedPixels);
}
}
// Create a new GridCoverage2D with the copied image
GridCoverageFactory gridCoverageFactory = CoverageFactoryFinder.getGridCoverageFactory(null);
return gridCoverageFactory.create(gridCoverage2D.getName(), wr, gridCoverage2D.getEnvelope());
// Add a sample dimension for newly added band
int numBand = wr.getNumBands();
GridSampleDimension[] originalSampleDimensions = gridCoverage2D.getSampleDimensions();
GridSampleDimension[] sampleDimensions = new GridSampleDimension[numBand];
System.arraycopy(originalSampleDimensions, 0, sampleDimensions, 0, originalSampleDimensions.length);
sampleDimensions[numBand - 1] = new GridSampleDimension("band" + numBand);
// Construct a GridCoverage2D with the copied image.
return createCompatibleGridCoverage2D(gridCoverage2D, wr, sampleDimensions);
}

private static GridCoverage2D copyRasterAndReplaceBand(GridCoverage2D gridCoverage2D, int bandIndex, double[] bandValues) {
Expand All @@ -141,7 +155,20 @@ private static GridCoverage2D copyRasterAndReplaceBand(GridCoverage2D gridCovera
}
}
// Create a new GridCoverage2D with the copied image
return createCompatibleGridCoverage2D(gridCoverage2D, wr, gridCoverage2D.getSampleDimensions());
}

private static GridCoverage2D createCompatibleGridCoverage2D(GridCoverage2D gridCoverage2D, WritableRaster wr, GridSampleDimension[] bands) {
int rasterDataType = wr.getDataBuffer().getDataType();
int numBand = wr.getNumBands();
final ColorSpace cs = new BogusColorSpace(numBand);
final int[] nBits = new int[numBand];
Arrays.fill(nBits, DataBuffer.getDataTypeSize(rasterDataType));
ColorModel colorModel =
new ComponentColorModel(cs, nBits, false, true, Transparency.OPAQUE, rasterDataType);
final RenderedImage image = new BufferedImage(colorModel, wr, false, null);
GridCoverageFactory gridCoverageFactory = CoverageFactoryFinder.getGridCoverageFactory(null);
return gridCoverageFactory.create(gridCoverage2D.getName(), wr, gridCoverage2D.getEnvelope());
return gridCoverageFactory.create(gridCoverage2D.getName(), image, gridCoverage2D.getCoordinateReferenceSystem(),
gridCoverage2D.getGridGeometry().getGridToCRS(), bands, null, null);
}
}
11 changes: 11 additions & 0 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 @@ -452,5 +452,16 @@ class rasteralgebraTest extends TestBaseScala with BeforeAndAfter with GivenWhen
assert(df.selectExpr("RS_Intersects(raster, ST_SetSRID(ST_Point(33.81798,-117.47993), 4326))").first().getBoolean(0))
assert(!df.selectExpr("RS_Intersects(raster, ST_SetSRID(ST_Point(33.97896,-117.27868), 4326))").first().getBoolean(0))
}

it("Passed RS_AddBandFromArray collect generated raster") {
var df = sparkSession.read.format("binaryFile").load(resourceFolder + "raster/test1.tiff")
df = df.selectExpr("RS_FromGeoTiff(content) as raster", "RS_BandAsArray(RS_FromGeoTiff(content), 1) as band")
df = df.selectExpr("RS_AddBandFromArray(raster, band, 1) as raster", "band")
var raster = df.collect().head.getAs[GridCoverage2D](0)
assert(raster.getNumSampleDimensions == 1)
df = df.selectExpr("RS_AddBandFromArray(raster, band, 2) as raster", "band")
raster = df.collect().head.getAs[GridCoverage2D](0)
assert(raster.getNumSampleDimensions == 2)
}
}
}
Loading