RasterRef should not read HDFS scheme with GDAL reader.

core/src/main/resources/reference.conf

@@ -4,7 +4,7 @@ rasterframes {
   showable-tiles = true
   showable-max-cells = 20
   max-truncate-row-element-length = 40
-  raster-source-cache-timeout = 120 seconds
+  raster-source-cache-timeout = 1 seconds
 }
 
 vlm.gdal {

core/src/main/scala/org/locationtech/rasterframes/ref/RasterSource.scala

@@ -101,9 +101,12 @@ object RasterSource extends LazyLogging {
     ExpressionEncoder()
   }
 
+  def apply(source: String): RasterSource = apply(new URI(source))
+
   def apply(source: URI): RasterSource =
-    rsCache.get(
-      source.toASCIIString, _ => source match {
+//    rsCache.get(
+//      source.toASCIIString, _ =>
+    source match {
         case IsGDAL()          => GDALRasterSource(source)
         case IsHadoopGeoTiff() =>
           // TODO: How can we get the active hadoop configuration
@@ -113,7 +116,7 @@ object RasterSource extends LazyLogging {
         case IsDefaultGeoTiff() => JVMGeoTiffRasterSource(source)
         case s                  => throw new UnsupportedOperationException(s"Reading '$s' not supported")
       }
-    )
+//    )
 
   object IsGDAL {
 
@@ -122,6 +125,8 @@ object RasterSource extends LazyLogging {
 
     val gdalOnlyExtensions = Seq(".jp2", ".mrf", ".hdf", ".vrt")
 
+    val blacklistedSchemes = Seq("s3a", "s3n", "wasbs")
+
     def gdalOnly(source: URI): Boolean =
       if (gdalOnlyExtensions.exists(source.getPath.toLowerCase.endsWith)) {
         require(GDALRasterSource.hasGDAL, s"Can only read $source if GDAL is available")
@@ -130,26 +135,43 @@ object RasterSource extends LazyLogging {
 
     /** Extractor for determining if a scheme indicates GDAL preference.  */
     def unapply(source: URI): Boolean = {
+
+      lazy val schemeIsNotHadoop = Option(source.getScheme())
+        .filter(blacklistedSchemes.contains)
+        .isEmpty
+
       lazy val schemeIsGdal = Option(source.getScheme())
-        .exists(_.startsWith("gdal"))
+        .exists(_ == "gdal") && schemeIsNotHadoop
+
+      (gdalOnly(source) && schemeIsNotHadoop) ||
+        (GDALRasterSource.hasGDAL &&
+          (preferGdal && schemeIsGdal) ||
+          (preferGdal && schemeIsNotHadoop)
+        )
 
-      gdalOnly(source) || ((preferGdal || schemeIsGdal) && GDALRasterSource.hasGDAL)
     }
   }
 
   object IsDefaultGeoTiff {
-    def unapply(source: URI): Boolean = source.getScheme match {
-      case "file" | "http" | "https" | "s3" => true
-      case null | ""                        ⇒ true
-      case _                                => false
+    import IsGDAL.gdalOnly
+    def unapply(source: URI): Boolean = {
+      if (gdalOnly(source)) false
+      else source.getScheme match {
+        case "file" | "http" | "https" | "s3" => true
+        case null | ""                        ⇒ true
+        case _                                => false
+      }
     }
   }
 
   object IsHadoopGeoTiff {
-    def unapply(source: URI): Boolean = source.getScheme match {
-      case "hdfs" | "s3n" | "s3a" | "wasb" | "wasbs" => true
-      case _                                         => false
-    }
+    import IsGDAL.gdalOnly
+    def unapply(source: URI): Boolean =
+      if (gdalOnly(source)) false
+      else source.getScheme match {
+        case "hdfs" | "s3n" | "s3a" | "wasb" | "wasbs" => true
+        case _                                         => false
+      }
   }
 
   trait URIRasterSource { _: RasterSource =>

core/src/test/scala/org/locationtech/rasterframes/ref/RasterSourceSpec.scala

@@ -141,6 +141,16 @@ class RasterSourceSpec extends TestEnvironment with TestData {
   }
 
   if(GDALRasterSource.hasGDAL) {
+    it("should choose correct delegate for scheme and file"){
+      val hdfsSchemeTif = RasterSource("s3n://bucket/prefix/raster.tif")
+      val easySchemeTif = RasterSource("s3://bucket/prefix/raster.tif")  // should interpret as /vsis3/
+      lazy val hdfsSchemeJp2 = RasterSource("s3n://s22s-test-geotiffs/luray_snp/B04.jp2")  // can't read with hadoop reader
+
+      hdfsSchemeTif should matchPattern {case HadoopGeoTiffRasterSource(_, _) ⇒}
+      easySchemeTif should matchPattern {case GDALRasterSource(_) ⇒}
+      assertThrows[UnsupportedOperationException](hdfsSchemeJp2.bandCount)
+
+    }
     describe("GDAL Rastersource") {
       val gdal = GDALRasterSource(cogPath)
       val jvm = JVMGeoTiffRasterSource(cogPath)

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

@@ -300,9 +300,6 @@ def test_render_composite(self):
         # Look for the PNG magic cookie
         self.assertEqual(png_bytes[0:8], bytearray([0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]))
 
-
-
-
     def test_rf_interpret_cell_type_as(self):
         from pyspark.sql import Row
         from pyrasterframes.rf_types import Tile