Merge branch 'release/0.8.3'

Author: metasim

build/circleci/Dockerfile

@@ -1,6 +1,6 @@
 FROM circleci/openjdk:8-jdk
 
-ENV OPENJPEG_VERSION 2.3.0
+ENV OPENJPEG_VERSION 2.3.1
 ENV GDAL_VERSION 2.4.1
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
 
@@ -11,26 +11,37 @@ RUN sudo apt-get update && \
       python python-minimal python2.7 python2.7-minimal \
       libpython-stdlib libpython2.7 libpython2.7-minimal libpython2.7-stdlib \
     && sudo apt-get install -y \
-      python3 \
-      python3-pip \
       pandoc \
       wget \
       gcc g++ build-essential \
+      libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev \
             libcurl4-gnutls-dev \
             libproj-dev \
             libgeos-dev \
             libhdf4-alt-dev \
-            libhdf5-serial-dev \
             bash-completion \
             cmake \
             imagemagick \
             libpng-dev \
-            swig \
-            ant \
+            libffi-dev \
     && sudo apt autoremove \
-    && sudo apt-get clean all \
-    && pip3 install setuptools ipython==6.2.1 \
-    && sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1
+    && sudo apt-get clean all
+#    && sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1
+# todo s
+
+RUN cd /tmp && \
+  wget https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tgz && \
+  tar xzf Python-3.7.4.tgz && \
+  cd Python-3.7.4 && \
+  ./configure  --with-ensurepip=install --prefix=/usr/local --enable-optimization && \
+  make && \
+  sudo make altinstall && \
+  rm -rf Python-3.7.4*
+
+RUN sudo ln -s /usr/local/bin/python3.7 /usr/local/bin/python && \
+  sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
+  sudo python get-pip.py && \
+  sudo pip3 install setuptools ipython==6.2.1
 
 # install OpenJPEG
 RUN cd /tmp && \
@@ -52,11 +63,9 @@ RUN cd /tmp && \
     ./configure \
         --with-curl \
         --with-hdf4 \
-        --with-hdf5 \
         --with-geos \
         --with-geotiff=internal \
         --with-hide-internal-symbols \
-        --with-java=$JAVA_HOME \
         --with-libtiff=internal \
         --with-libz=internal \
         --with-mrf \
@@ -68,7 +77,5 @@ RUN cd /tmp && \
     && \
     make -j 8 && \
     sudo make install && \
-    cd swig/java && \
-    sudo make install && \
     sudo ldconfig && \
     cd /tmp && sudo rm -Rf gdal*

build/circleci/Makefile

@@ -0,0 +1,2 @@
+all:
+	docker build -t "s22s/rasterframes-circleci:latest" .

build/circleci/README.md

@@ -1,6 +1,6 @@
 # CircleCI Dockerfile Build file
 
 ```bash
-docker build -t s22s/rasterframes-circleci:latest .
+make
 docker push s22s/rasterframes-circleci:latest
 ```

core/src/main/resources/reference.conf

@@ -14,6 +14,9 @@ vlm.gdal {
       AWS_REQUEST_PAYER = "requester"
       GDAL_DISABLE_READDIR_ON_OPEN = "YES"
       CPL_VSIL_CURL_ALLOWED_EXTENSIONS = ".tif,.tiff,.jp2,.mrf,.idx,.lrc,.mrf.aux.xml,.vrt"
+      GDAL_CACHEMAX = 512
+      GDAL_PAM_ENABLED = "NO"
+      CPL_VSIL_CURL_CHUNK_SIZE = 1000000
     }
     // set this to `false` if CPL_DEBUG is `ON`
     useExceptions = true

core/src/main/scala/org/apache/spark/sql/rf/TileUDT.scala

@@ -26,6 +26,7 @@ import org.apache.spark.sql.types.{DataType, _}
 import org.locationtech.rasterframes.encoders.CatalystSerializer
 import org.locationtech.rasterframes.encoders.CatalystSerializer._
 import org.locationtech.rasterframes.model.{Cells, TileDataContext}
+import org.locationtech.rasterframes.ref.RasterRef.RasterRefTile
 import org.locationtech.rasterframes.tiles.InternalRowTile
 
 
@@ -75,12 +76,15 @@ case object TileUDT  {
   implicit def tileSerializer: CatalystSerializer[Tile] = new CatalystSerializer[Tile] {
 
     override val schema: StructType = StructType(Seq(
-      StructField("cell_context", schemaOf[TileDataContext], false),
+      StructField("cell_context", schemaOf[TileDataContext], true),
       StructField("cell_data", schemaOf[Cells], false)
     ))
 
     override def to[R](t: Tile, io: CatalystIO[R]): R = io.create(
-      io.to(TileDataContext(t)),
+      t match {
+        case _: RasterRefTile => null
+        case o => io.to(TileDataContext(o))
+      },
       io.to(Cells(t))
     )
 

core/src/main/scala/org/locationtech/rasterframes/expressions/BinaryLocalRasterOp.scala

@@ -21,18 +21,22 @@
 
 package org.locationtech.rasterframes.expressions
 
-import org.locationtech.rasterframes.encoders.CatalystSerializer._
-import org.locationtech.rasterframes.expressions.DynamicExtractors._
-import com.typesafe.scalalogging.LazyLogging
+import com.typesafe.scalalogging.Logger
 import geotrellis.raster.Tile
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
 import org.apache.spark.sql.catalyst.expressions.BinaryExpression
 import org.apache.spark.sql.rf.TileUDT
 import org.apache.spark.sql.types.DataType
+import org.locationtech.rasterframes.encoders.CatalystSerializer._
+import org.locationtech.rasterframes.expressions.DynamicExtractors._
+import org.slf4j.LoggerFactory
 
 /** Operation combining two tiles or a tile and a scalar into a new tile. */
-trait BinaryLocalRasterOp extends BinaryExpression with LazyLogging {
+trait BinaryLocalRasterOp extends BinaryExpression {
+
+  @transient protected lazy val logger = Logger(LoggerFactory.getLogger(getClass.getName))
+
 
   override def dataType: DataType = left.dataType
 

core/src/main/scala/org/locationtech/rasterframes/expressions/BinaryRasterOp.scala

@@ -21,18 +21,20 @@
 
 package org.locationtech.rasterframes.expressions
 
-import org.locationtech.rasterframes.expressions.DynamicExtractors.tileExtractor
-import org.locationtech.rasterframes.encoders.CatalystSerializer._
-import com.typesafe.scalalogging.LazyLogging
+import com.typesafe.scalalogging.Logger
 import geotrellis.raster.Tile
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
 import org.apache.spark.sql.catalyst.expressions.BinaryExpression
 import org.apache.spark.sql.rf.TileUDT
 import org.apache.spark.sql.types.DataType
+import org.locationtech.rasterframes.encoders.CatalystSerializer._
+import org.locationtech.rasterframes.expressions.DynamicExtractors.tileExtractor
+import org.slf4j.LoggerFactory
 
 /** Operation combining two tiles into a new tile. */
-trait BinaryRasterOp extends BinaryExpression with LazyLogging {
+trait BinaryRasterOp extends BinaryExpression {
+  @transient protected lazy val logger = Logger(LoggerFactory.getLogger(getClass.getName))
 
   override def dataType: DataType = left.dataType
 

core/src/main/scala/org/locationtech/rasterframes/expressions/UnaryLocalRasterOp.scala

@@ -21,18 +21,20 @@
 
 package org.locationtech.rasterframes.expressions
 
-import org.locationtech.rasterframes.encoders.CatalystSerializer._
-import org.locationtech.rasterframes.expressions.DynamicExtractors._
-import com.typesafe.scalalogging.LazyLogging
+import com.typesafe.scalalogging.Logger
 import geotrellis.raster.Tile
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
 import org.apache.spark.sql.catalyst.expressions.UnaryExpression
 import org.apache.spark.sql.rf.TileUDT
 import org.apache.spark.sql.types.DataType
+import org.locationtech.rasterframes.encoders.CatalystSerializer._
+import org.locationtech.rasterframes.expressions.DynamicExtractors._
+import org.slf4j.LoggerFactory
 
 /** Operation on a tile returning a tile. */
-trait UnaryLocalRasterOp extends UnaryExpression with LazyLogging {
+trait UnaryLocalRasterOp extends UnaryExpression {
+  @transient protected lazy val logger = Logger(LoggerFactory.getLogger(getClass.getName))
 
   override def dataType: DataType = child.dataType
 

core/src/main/scala/org/locationtech/rasterframes/expressions/UnaryRasterAggregate.scala

@@ -37,10 +37,11 @@ trait UnaryRasterAggregate extends DeclarativeAggregate {
   def children = Seq(child)
 
   protected def tileOpAsExpression[R: TypeTag](name: String, op: Tile => R): Expression => ScalaUDF =
-    udfexpr[R, Any](name, (a: Any) => op(extractTileFromAny(a)))
+    udfexpr[R, Any](name, (a: Any) => if(a == null) null.asInstanceOf[R] else op(extractTileFromAny(a)))
 
   protected val extractTileFromAny = (a: Any) => a match {
     case t: Tile => t
     case r: Row => rowTileExtractor(child.dataType)(r)._1
+    case null => null
   }
 }

core/src/main/scala/org/locationtech/rasterframes/expressions/accessors/GetCRS.scala

@@ -21,33 +21,53 @@
 
 package org.locationtech.rasterframes.expressions.accessors
 
-import org.locationtech.rasterframes.encoders.CatalystSerializer._
-import org.locationtech.rasterframes.encoders.StandardEncoders.crsEncoder
-import org.locationtech.rasterframes.expressions.OnTileContextExpression
 import geotrellis.proj4.CRS
 import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
+import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
 import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.catalyst.expressions.codegen.CodegenFallback
-import org.apache.spark.sql.types.DataType
+import org.apache.spark.sql.types.{DataType, StringType}
 import org.apache.spark.sql.{Column, TypedColumn}
-import org.locationtech.rasterframes.model.TileContext
+import org.apache.spark.unsafe.types.UTF8String
+import org.locationtech.rasterframes.encoders.CatalystSerializer._
+import org.locationtech.rasterframes.encoders.StandardEncoders.crsEncoder
+import org.locationtech.rasterframes.expressions.DynamicExtractors.projectedRasterLikeExtractor
+import org.locationtech.rasterframes.model.LazyCRS
 
 /**
  * Expression to extract the CRS out of a RasterRef or ProjectedRasterTile column.
  *
  * @since 9/9/18
  */
 @ExpressionDescription(
-  usage = "_FUNC_(raster) - Fetches the CRS of a ProjectedRasterTile or RasterSource.",
+  usage = "_FUNC_(raster) - Fetches the CRS of a ProjectedRasterTile or RasterSource, or converts a proj4 string column.",
   examples = """
     Examples:
       > SELECT _FUNC_(raster);
          ....
   """)
-case class GetCRS(child: Expression) extends OnTileContextExpression with CodegenFallback {
+case class GetCRS(child: Expression) extends UnaryExpression with CodegenFallback {
   override def dataType: DataType = schemaOf[CRS]
   override def nodeName: String = "rf_crs"
-  override def eval(ctx: TileContext): InternalRow = ctx.crs.toInternalRow
+
+  override def checkInputDataTypes(): TypeCheckResult = {
+    if (child.dataType != StringType && !projectedRasterLikeExtractor.isDefinedAt(child.dataType)) {
+      TypeCheckFailure(s"Input type '${child.dataType}' does not conform to `String` or `ProjectedRasterLike`.")
+    }
+    else TypeCheckSuccess
+  }
+
+  override protected def nullSafeEval(input: Any): Any = {
+    input match {
+      case s: UTF8String => LazyCRS(s.toString).toInternalRow
+      case row: InternalRow ⇒
+        val prl = projectedRasterLikeExtractor(child.dataType)(row)
+        prl.crs.toInternalRow
+      case o ⇒ throw new IllegalArgumentException(s"Unsupported input type: $o")
+    }
+  }
+
 }
 
 object GetCRS {