Clean STACDataSources

Author: pomadchin

core/src/test/scala/org/locationtech/rasterframes/expressions/DynamicExtractorsSpec.scala

@@ -95,5 +95,4 @@ object DynamicExtractorsSpec {
   object SnowflakeExtent2 {
     implicit val enc: ExpressionEncoder[SnowflakeExtent2] = Encoders.product[SnowflakeExtent2].asInstanceOf[ExpressionEncoder[SnowflakeExtent2]]
   }
-
 }

datasource/src/main/scala/com/azavea/stac4s/api/client/search/SearchContext.scala

@@ -1,32 +1,10 @@
 package com.azavea.stac4s.api.client
 
-import cats.{ApplicativeThrow, Monad}
-import cats.syntax.flatMap._
-import cats.syntax.either._
 import com.azavea.stac4s.StacItem
-import io.circe.{Json, JsonObject}
-import io.circe.syntax._
-import sttp.client3.circe.asJson
-import sttp.client3.basicRequest
 import fs2.Stream
 
 package object search {
-  implicit class Stac4sClientOps[F[_]: Monad: ApplicativeThrow](val self: SttpStacClient[F]) {
+  implicit class Stac4sClientOps[F[_]](val self: SttpStacClient[F]) extends AnyVal {
     def search(filter: Option[SearchFilters]): Stream[F, StacItem] = filter.fold(self.search)(self.search)
-
-    def searchContext(filter: Option[SearchFilters]): F[SearchContext] =
-      self
-        .client
-        .send(
-          basicRequest
-            .body(filter.map(_.asJson).getOrElse(JsonObject.empty.asJson).noSpaces)
-            .post(self.baseUri.addPath("search"))
-            .response(asJson[Json])
-        )
-        .flatMap {
-          _
-            .body
-            .flatMap(_.hcursor.downField("context").as[SearchContext]).liftTo[F]
-        }
   }
 }

datasource/src/main/scala/com/azavea/stac4s/api/client/search/package.scala

@@ -40,14 +40,15 @@ import org.locationtech.rasterframes.datasource.geotrellis.GeoTrellisCatalog.Geo
 class GeoTrellisCatalog extends DataSourceRegister with RelationProvider {
   def shortName() = "geotrellis-catalog"
 
-  def createRelation(sqlContext: SQLContext, parameters: Map[String, String]) = {
+  def createRelation(sqlContext: SQLContext, parameters: Map[String, String]): GeoTrellisCatalogRelation = {
     require(parameters.contains("path"), "'path' parameter required.")
     val uri: URI = URI.create(parameters("path"))
     GeoTrellisCatalogRelation(sqlContext, uri)
   }
 }
 
 object GeoTrellisCatalog {
+  implicit val layerStuffEncoder: Encoder[(Int, Layer)] = Encoders.tuple(Encoders.scalaInt, layerEncoder)
 
   case class GeoTrellisCatalogRelation(sqlContext: SQLContext, uri: URI) extends BaseRelation with TableScan {
     import sqlContext.implicits._
@@ -67,10 +68,6 @@ object GeoTrellisCatalog {
         json.add("index", jid).asJson
       }
 
-      implicit val layerStuffEncoder: Encoder[(Int, Layer)] = Encoders.tuple(
-        Encoders.scalaInt, layerEncoder
-      )
-
       val layerIds = attributes.layerIds
 
       val layerSpecs = layerIds.zipWithIndex.map {
@@ -81,13 +78,13 @@ object GeoTrellisCatalog {
         .toDF("index", "layer")
 
       val headerRows = layerSpecs
-        .map{case (index, layer) =>(index, attributes.readHeader[io.circe.JsonObject](layer.id))}
+        .map{ case (index, layer) => (index, attributes.readHeader[io.circe.JsonObject](layer.id)) }
         .map(mergeId.tupled)
         .map(io.circe.Printer.noSpaces.print)
         .toDS
 
       val metadataRows = layerSpecs
-        .map{case (index, layer) => (index, attributes.readMetadata[io.circe.JsonObject](layer.id))}
+        .map{ case (index, layer) => (index, attributes.readMetadata[io.circe.JsonObject](layer.id)) }
         .map(mergeId.tupled)
         .map(io.circe.Printer.noSpaces.print)
         .toDS