Upgraded to GeoTrellis 3.2.

Regressions.

Author: metasim

core/src/test/scala/org/locationtech/rasterframes/TestEnvironment.scala

@@ -32,6 +32,7 @@ import org.apache.spark.sql.functions.col
 import org.apache.spark.sql.types.StructType
 import org.apache.spark.{SparkConf, SparkContext}
 import org.locationtech.jts.geom.Geometry
+import org.locationtech.rasterframes.ref.RasterRef
 import org.locationtech.rasterframes.tiles.ProjectedRasterTile
 import org.locationtech.rasterframes.util._
 import org.scalactic.Tolerance
@@ -131,6 +132,8 @@ trait TestEnvironment extends FunSpec
     docs shouldNot include("N/A")
   }
 
-  implicit def pairEnc: Encoder[(ProjectedRasterTile, ProjectedRasterTile)] = Encoders.tuple(ProjectedRasterTile.prtEncoder, ProjectedRasterTile.prtEncoder)
-  implicit def tripEnc: Encoder[(ProjectedRasterTile, ProjectedRasterTile, ProjectedRasterTile)] = Encoders.tuple(ProjectedRasterTile.prtEncoder, ProjectedRasterTile.prtEncoder, ProjectedRasterTile.prtEncoder)
+  implicit def prt2Enc: Encoder[(ProjectedRasterTile, ProjectedRasterTile)] = Encoders.tuple(ProjectedRasterTile.prtEncoder, ProjectedRasterTile.prtEncoder)
+  implicit def prt3Enc: Encoder[(ProjectedRasterTile, ProjectedRasterTile, ProjectedRasterTile)] = Encoders.tuple(ProjectedRasterTile.prtEncoder, ProjectedRasterTile.prtEncoder, ProjectedRasterTile.prtEncoder)
+  implicit def rr2Enc: Encoder[(RasterRef, RasterRef)] = Encoders.tuple(RasterRef.rrEncoder, RasterRef.rrEncoder)
+  implicit def rr3Enc: Encoder[(RasterRef, RasterRef, RasterRef)] = Encoders.tuple(RasterRef.rrEncoder, RasterRef.rrEncoder, RasterRef.rrEncoder)
 }

docs/src/main/paradox/release-notes.md

@@ -4,7 +4,7 @@
 
 ### 0.9.0
 
-* Upgraded to GeoTrellis 3.1.0. This includes a number of _breaking_ changes enumerated as a part of the [PR's](https://github.com/locationtech/rasterframes/pull/398) change log. These include:
+* Upgraded to GeoTrellis 3.2.0. This includes a number of _breaking_ changes enumerated as a part of the [PR's](https://github.com/locationtech/rasterframes/pull/398) change log. These include:
   - Add `Int` type parameter to `Grid`
   - Add `Int` type parameter to `CellGrid`
   - Add `Int` type parameter to `GridBounds`... or `TileBounds`
@@ -22,7 +22,8 @@
   - Revisit use of `Tile` equality since [it's more strict](https://github.com/locationtech/geotrellis/pull/2991)
   - Update `reference.conf` to use `geotrellis.raster.gdal` namespace.
   - Replace all uses of `TileDimensions` with `geotrellis.raster.Dimensions[Int]`.
-* Formally abandon support for Python 2. Python 2 is dead. Long live Python 2.
+* Formally abandoned support for Python 2. Python 2 is dead. Long live Python 2.
+* Introduction of type hints in Python API. 
 
 ## 0.8.x
 

project/RFDependenciesPlugin.scala

@@ -72,7 +72,7 @@ object RFDependenciesPlugin extends AutoPlugin {
     },
     // NB: Make sure to update the Spark version in pyrasterframes/python/setup.py
     rfSparkVersion := "2.4.4",
-    rfGeoTrellisVersion := "3.1.0",
+    rfGeoTrellisVersion := "3.2.0",
     rfGeoMesaVersion := "2.2.1"
   )
 }

pyrasterframes/src/main/python/docs/sjoin.pymd

@@ -21,7 +21,7 @@
 import pyrasterframes.rf_types
 from pyrasterframes.rf_types import Tile
 from shapely.geometry.base import BaseGeometry
-import matplotlib.axes.Axes
+from matplotlib.axes import Axes
 import numpy as np
 from pandas import DataFrame
 from typing import Optional, Tuple
@@ -30,12 +30,13 @@
 
 
 def plot_tile(tile: Tile, normalize: bool = True, lower_percentile: float = 1., upper_percentile: float = 99.,
-              axis: Optional[matplotlib.axis.Axes] = None, **imshow_args):
+              axis: Optional[Axes] = None, **imshow_args):
     """
     Display an image of the tile
 
     Parameters
     ----------
+    tile: item to plot
     normalize: if True, will normalize the data between using
                lower_percentile and upper_percentile as bounds
     lower_percentile: between 0 and 100 inclusive.