Skip to content

Fix RasterJoin coalesce issue #500

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

Merged
merged 2 commits into from
Aug 21, 2020
Merged

Fix RasterJoin coalesce issue #500

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
0a0bc20
Add failing unit test on minimum reproducible example of #499
vpipkt Aug 20, 2020
f8e3a3b
Fix coalesce issue in RasterJoin
vpipkt Aug 20, 2020
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
2 changes: 1 addition & 1 deletion core/src/main/scala/org/locationtech/rasterframes/extensions/RasterJoin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ object RasterJoin {
// Assumes all LHS tiles in a row are of the same size.
val destDims =
if (left.tileColumns.nonEmpty)
rf_dimensions(coalesce(left.tileColumns.map(unresolved): _*))
coalesce(left.tileColumns.map(unresolved).map(rf_dimensions): _*)
else
serialized_literal(fallbackDimensions.getOrElse(NOMINAL_TILE_DIMS))

Expand Down
10 changes: 10 additions & 0 deletions core/src/test/scala/org/locationtech/rasterframes/RasterJoinSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,16 @@ class RasterJoinSpec extends TestEnvironment with TestData with RasterMatchers {
}
}

it("should raster join multiple times on projected raster"){
val df0 = Seq(one).toDF("proj_raster")
val result = df0.select($"proj_raster" as "t1")
.rasterJoin(df0.select($"proj_raster" as "t2"))
.rasterJoin(df0.select($"proj_raster" as "t3"))

result.tileColumns.length should be (3)
result.count() should be (1)
}

it("should honor resampling options") {
// test case. replicate existing test condition and check that resampling option results in different output
val filterExpr = st_intersects(rf_geometry($"tile"), st_point(704940.0, 4251130.0))
Expand Down
13 changes: 12 additions & 1 deletion core/src/test/scala/org/locationtech/rasterframes/functions/TileFunctionsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import geotrellis.raster._
import geotrellis.raster.testkit.RasterMatchers
import javax.imageio.ImageIO
import org.apache.spark.sql.Encoders
import org.apache.spark.sql.functions.sum
import org.apache.spark.sql.functions.{count, sum, isnull}
import org.locationtech.rasterframes._
import org.locationtech.rasterframes.ref.RasterRef
import org.locationtech.rasterframes.tiles.ProjectedRasterTile
Expand Down Expand Up @@ -354,6 +354,17 @@ class TileFunctionsSpec extends TestEnvironment with RasterMatchers {
t should be(randPRT.dimensions)
checkDocs("rf_dimensions")
}

it("should get null for null tile dimensions") {
val result = (Seq(randPRT) :+ null).toDF("tile")
.select(rf_dimensions($"tile") as "dim")
.select(isnull($"dim").cast("long") as "n")
.agg(sum("n"), count("n"))
.first()
result.getAs[Long](0) should be (1)
result.getAs[Long](1) should be (2)
}

it("should get the Extent of a ProjectedRasterTile") {
val e = Seq(randPRT).toDF("tile").select(rf_extent($"tile")).first()
e should be(extent)
Expand Down