Merge remote-tracking branch 'locationtech/develop' into feature/tile-quantile

Author: vpipkt

.circleci/config.yml

@@ -5,7 +5,7 @@ _defaults: &defaults
   environment:
     TERM: dumb
   docker:
-    - image: s22s/rasterframes-circleci:latest
+    - image: s22s/rasterframes-circleci:9b7682ef
 
 _setenv: &setenv
   name: set CloudRepo credentials

build/circleci/Dockerfile

@@ -2,6 +2,7 @@ FROM circleci/openjdk:8-jdk
 
 ENV OPENJPEG_VERSION 2.3.1
 ENV GDAL_VERSION 2.4.1
+ENV SPATIALINDEX_VERSION 1.9.3
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
 
 # most of these libraries required for
@@ -74,3 +75,15 @@ RUN \
     sudo make install && \
     sudo ldconfig && \
     cd /tmp && sudo rm -Rf gdal*
+
+# Compile and install libspatialindex
+RUN \
+    cd /tmp && \
+    wget https://github.com/libspatialindex/libspatialindex/releases/download/${SPATIALINDEX_VERSION}/spatialindex-src-${SPATIALINDEX_VERSION}.tar.gz && \
+    tar -xf spatialindex-src-${SPATIALINDEX_VERSION}.tar.gz && \
+    cd spatialindex-src-${SPATIALINDEX_VERSION}/ && \
+    cmake  -DCMAKE_INSTALL_PREFIX=/usr/local/ && \
+    make && \
+    sudo make install && \
+    sudo ldconfig && \
+    cd /tmp && sudo rm -Rf spatialindex*

core/src/main/scala/org/locationtech/rasterframes/expressions/transformers/Mask.scala

@@ -23,7 +23,7 @@ package org.locationtech.rasterframes.expressions.transformers
 
 import com.typesafe.scalalogging.Logger
 import geotrellis.raster
-import geotrellis.raster.Tile
+import geotrellis.raster.{NoNoData, Tile}
 import geotrellis.raster.mapalgebra.local.{Undefined, InverseMask ⇒ gtInverseMask, Mask ⇒ gtMask}
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
@@ -73,6 +73,10 @@ abstract class Mask(val left: Expression, val middle: Expression, val right: Exp
   override protected def nullSafeEval(targetInput: Any, maskInput: Any, maskValueInput: Any): Any = {
     implicit val tileSer = TileUDT.tileSerializer
     val (targetTile, targetCtx) = tileExtractor(targetExp.dataType)(row(targetInput))
+
+    require(! targetTile.cellType.isInstanceOf[NoNoData],
+      s"Input data expression ${left.prettyName} must have a CellType with NoData defined in order to perform a masking operation. Found CellType ${targetTile.cellType.toString()}.")
+
     val (maskTile, maskCtx) = tileExtractor(maskExp.dataType)(row(maskInput))
 
     if (targetCtx.isEmpty && maskCtx.isDefined)