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.

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-334] Add RS_ScaleX and RS_ScaleY #932

Merged
merged 7 commits into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
package org.apache.sedona.common.raster;

import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.grid.GridGeometry2D;
import org.geotools.coverage.processing.operation.Affine;
import org.geotools.geometry.Envelope2D;
import org.geotools.referencing.CRS;
import org.geotools.referencing.crs.DefaultEngineeringCRS;
Expand Down Expand Up @@ -62,6 +64,23 @@ public static int getHeight(GridCoverage2D raster) {
}


public static double getScaleX(GridCoverage2D raster) {
return getAffineTransform(raster).getScaleX();
}

public static double getScaleY(GridCoverage2D raster) {
return getAffineTransform(raster).getScaleY();
}

private static AffineTransform2D getAffineTransform(GridCoverage2D raster) throws UnsupportedOperationException {
GridGeometry2D gridGeometry2D = raster.getGridGeometry();
MathTransform crsTransform = gridGeometry2D.getGridToCRS2D();
if (!(crsTransform instanceof AffineTransform2D)) {
throw new UnsupportedOperationException("Only AffineTransform2D is supported");
}
return (AffineTransform2D) crsTransform;
}


public static Geometry envelope(GridCoverage2D raster) throws FactoryException {
Envelope2D envelope2D = raster.getEnvelope2D();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,18 @@ public void testSrid() throws FactoryException {
assertEquals(4326, RasterAccessors.srid(multiBandRaster));
}

@Test
public void testScaleX() throws UnsupportedOperationException, FactoryException {
GridCoverage2D emptyRaster = RasterConstructors.makeEmptyRaster(2, 10, 15, 0, 0, 1, 2, 0, 0, 0);
assertEquals(1, RasterAccessors.getScaleX(emptyRaster), 1e-9);
}

@Test
public void testScaleY() throws UnsupportedOperationException, FactoryException {
GridCoverage2D emptyRaster = RasterConstructors.makeEmptyRaster(2, 10, 15, 0, 0, 1, 2, 0, 0, 0);
assertEquals(-2, RasterAccessors.getScaleY(emptyRaster), 1e-9);
}

@Test
public void testMetaData()
throws FactoryException
Expand Down
46 changes: 46 additions & 0 deletions docs/api/sql/Raster-operators.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,52 @@ Output:
512
```

### RS_ScaleX

Introduction: Returns the pixel width of the raster in CRS units.
!!!Note
RS_ScaleX attempts to get an Affine transform on the grid in order to return scaleX (See [World File](https://en.wikipedia.org/wiki/World_file) for more details). If the transform on the geometry is not an Affine transform, RS_ScaleX will throw an UnsupportedException:
```
UnsupportedOperationException("Only AffineTransform2D is supported")
```

Format: `RS_ScaleX(raster: Raster)`

Since: `1.5.0`

Spark SQL example:
```sql
SELECT RS_ScaleX(raster) FROM rasters
```

Output:
```
1
```

### RS_ScaleY

Introduction: Returns the pixel height of the raster in CRS units.
!!!Note
RS_ScaleY attempts to get an Affine transform on the grid in order to return scaleX (See [World File](https://en.wikipedia.org/wiki/World_file) for more details). If the transform on the geometry is not an Affine transform, RS_ScaleY will throw an UnsupportedException:
```
UnsupportedOperationException("Only AffineTransform2D is supported")
```

Format: `RS_ScaleY(raster: Raster)`

Since: `1.5.0`

Spark SQL example:
```sql
SELECT RS_ScaleY(raster) FROM rasters
```

Output:
```
-2
```

### RS_Width

Introduction: Returns the width of the raster.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ object Catalog {
function[RS_AsGeoTiff](),
function[RS_AsArcGrid](),
function[RS_Width](),
function[RS_Height]()
function[RS_Height](),
function[RS_ScaleX](),
function[RS_ScaleY]()
)

val aggregateExpressions: Seq[Aggregator[Geometry, Geometry, Geometry]] = Seq(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,18 @@ case class RS_Height(inputExpressions: Seq[Expression]) extends InferredExpressi
protected def withNewChildrenInternal(newChildren: IndexedSeq[Expression]) = {
copy(inputExpressions = newChildren)
}
}
}


case class RS_ScaleX(inputExpressions: Seq[Expression]) extends InferredExpression(RasterAccessors.getScaleX _) {
protected def withNewChildrenInternal(newChildren: IndexedSeq[Expression]) = {
copy(inputExpressions = newChildren)
}
}

case class RS_ScaleY(inputExpressions: Seq[Expression]) extends InferredExpression(RasterAccessors.getScaleY _) {
protected def withNewChildrenInternal(newChildren: IndexedSeq[Expression]) = {
copy(inputExpressions = newChildren)
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -488,5 +488,19 @@ class rasteralgebraTest extends TestBaseScala with BeforeAndAfter with GivenWhen
raster = df.collect().head.getAs[GridCoverage2D](0)
assert(raster.getNumSampleDimensions == 2)
}

it("Passed RS_ScaleX with raster") {
val df = sparkSession.read.format("binaryFile").load(resourceFolder + "raster/test1.tiff")
val result = df.selectExpr("RS_ScaleX(RS_FromGeoTiff(content))").first().getDouble(0)
val expected: Double = 72.32861272132695
assertEquals(expected, result, 1e-9)
}

it("Passed RS_ScaleY with raster") {
val df = sparkSession.read.format("binaryFile").load(resourceFolder + "raster/test1.tiff")
val result = df.selectExpr("RS_ScaleY(RS_FromGeoTiff(content))").first().getDouble(0)
val expected: Double = -72.32861272132695
assertEquals(expected, result, 1e-9)
}
}
}