Fix mistakes in merge with develop

Signed-off-by: Jason T. Brown <jason@astraea.earth>

Author: vpipkt

core/src/main/scala/org/locationtech/rasterframes/functions/AggregateFunctions.scala

@@ -51,7 +51,7 @@ trait AggregateFunctions {
   /** Compute the cellwise/local count of NoData cells for all Tiles in a column. */
   def rf_agg_local_no_data_cells(tile: Column): TypedColumn[Any, Tile] = LocalCountAggregate.LocalNoDataCellsUDAF(tile)
 
-  /**  Compute the full column aggregate floating point histogram. */
+  /**  Compute the approximate aggregate floating point histogram using a streaming algorithm, with the default of 80 buckets. */
   def rf_agg_approx_histogram(tile: Column): TypedColumn[Any, CellHistogram] = HistogramAggregate(tile)
 
   /**  Compute the approximate aggregate floating point histogram using a streaming algorithm, with the given number of buckets. */
@@ -60,6 +60,23 @@ trait AggregateFunctions {
     HistogramAggregate(col, numBuckets)
   }
 
+  /**
+    * Calculates the approximate quantiles of a tile column of a DataFrame.
+    * @param tile tile column to extract cells from.
+    * @param probabilities a list of quantile probabilities
+    *   Each number must belong to [0, 1].
+    *   For example 0 is the minimum, 0.5 is the median, 1 is the maximum.
+    * @param relativeError The relative target precision to achieve (greater than or equal to 0).
+    * @return the approximate quantiles at the given probabilities of each column
+    */
+  def rf_agg_approx_quantiles(
+                               tile: Column,
+                               probabilities: Seq[Double],
+                               relativeError: Double = 0.00001): TypedColumn[Any, Seq[Double]] = {
+    require(probabilities.nonEmpty, "at least one quantile probability is required")
+    ApproxCellQuantilesAggregate(tile, probabilities, relativeError)
+  }
+
   /** Compute the full column aggregate floating point statistics. */
   def rf_agg_stats(tile: Column): TypedColumn[Any, CellStatistics] = CellStatsAggregate(tile)
 

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

@@ -21,6 +21,7 @@
 
 package org.locationtech.rasterframes
 
+import org.locationtech.rasterframes.RasterFunctions
 import org.apache.spark.sql.functions.{col, explode}
 
 class RasterFramesStatsSpec extends TestEnvironment with TestData {

pyrasterframes/src/main/python/tests/RasterFunctionsTests.py

@@ -38,6 +38,7 @@
 class RasterFunctions(TestEnvironment):
 
     def setUp(self):
+        import sys
         if not sys.warnoptions:
             import warnings
             warnings.simplefilter("ignore")