Skip to content

Commit 87d7c9d

Browse files
committed
IT test build fix.
1 parent 9fe8278 commit 87d7c9d

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

core/src/it/scala/org/locationtech/rasterframes/ref/RasterRefIT.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ package org.locationtech.rasterframes.ref
2424
import java.net.URI
2525

2626
import geotrellis.proj4.LatLng
27-
2827
import geotrellis.vector.Extent
2928
import org.locationtech.rasterframes._
29+
import org.locationtech.rasterframes.expressions.aggregates.TileRasterizerAggregate
3030

3131
class RasterRefIT extends TestEnvironment {
3232
describe("practical subregion reads") {
@@ -44,14 +44,17 @@ class RasterRefIT extends TestEnvironment {
4444
val blue = RasterRef(RasterSource(scene(2)), 0, Some(area), None)
4545

4646
val rf = Seq((red, green, blue)).toDF("red", "green", "blue")
47-
val raster = rf.select(
47+
val df = rf.select(
4848
rf_crs($"red"), rf_extent($"red"), rf_tile($"red"), rf_tile($"green"), rf_tile($"blue"))
49-
.toDF.aggregateRaster(redScene.crs, None)
49+
.toDF
50+
51+
val raster = TileRasterizerAggregate(df, redScene.crs, None, None)
5052

5153
forEvery(raster.tile.statisticsDouble) { stats =>
5254
stats should be ('defined)
5355
stats.get.dataCells shouldBe > (1000L)
5456
}
57+
5558
//import geotrellis.raster.io.geotiff.{GeoTiffOptions, MultibandGeoTiff, Tiled}
5659
//import geotrellis.raster.io.geotiff.compression.{DeflateCompression, NoCompression}
5760
//import geotrellis.raster.io.geotiff.tags.codes.ColorSpace

experimental/src/it/scala/org/locationtech/rasterframes/experimental/datasource/awspds/L8CatalogRelationTest.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import geotrellis.vector.Extent
2525
import org.apache.spark.sql.functions._
2626
import org.locationtech.rasterframes._
2727
import org.locationtech.rasterframes.datasource.raster._
28+
import org.locationtech.rasterframes.expressions.aggregates.TileRasterizerAggregate
2829

2930
/**
3031
* Test rig for L8 catalog stuff.
@@ -124,8 +125,10 @@ class L8CatalogRelationTest extends TestEnvironment {
124125
.where(st_contains(rf_geometry($"B4"), st_reproject(geomLit(aoi.jtsGeom), lit("EPSG:4326"), rf_crs($"B4"))))
125126

126127

127-
val raster = df.aggregateRaster(LatLng, aoi, None)
128-
println(raster)
128+
noException should be thrownBy {
129+
val raster = TileRasterizerAggregate(df, LatLng, Some(aoi), None)
130+
println(raster)
131+
}
129132

130133
// import geotrellis.raster.io.geotiff.{GeoTiffOptions, MultibandGeoTiff, Tiled}
131134
// import geotrellis.raster.io.geotiff.compression.{DeflateCompression}

0 commit comments

Comments
 (0)