Change the STAC API search limit handling

Author: pomadchin

datasource/src/main/scala/org/locationtech/rasterframes/datasource/package.scala

@@ -52,7 +52,7 @@ package object datasource {
 
   private[rasterframes]
   def intParam(key: String, parameters: CaseInsensitiveStringMap): Option[Int] =
-    if(parameters.containsKey(key)) parameters.get(key).toInt.some
+    if(parameters.containsKey(key)) Option(parameters.get(key)).map(_.toInt)
     else None
 
   private[rasterframes]

datasource/src/main/scala/org/locationtech/rasterframes/datasource/stac/api/StacApiDataSource.scala

@@ -23,5 +23,5 @@ object StacApiDataSource {
   final val SHORT_NAME = "stac-api"
   final val URI_PARAM = "uri"
   final val SEARCH_FILTERS_PARAM = "search-filters"
-  final val ASSET_LIMIT_PARAM = "asset-limit"
+  final val SEARCH_LIMIT_PARAM = "search-limit"
 }

datasource/src/main/scala/org/locationtech/rasterframes/datasource/stac/api/StacApiTable.scala

@@ -7,7 +7,7 @@ import org.apache.spark.sql.connector.catalog.{SupportsRead, Table, TableCapabil
 import org.apache.spark.sql.connector.read.ScanBuilder
 import org.apache.spark.sql.types.StructType
 import org.apache.spark.sql.util.CaseInsensitiveStringMap
-import org.locationtech.rasterframes.datasource.stac.api.StacApiDataSource.{ASSET_LIMIT_PARAM, SEARCH_FILTERS_PARAM, URI_PARAM}
+import org.locationtech.rasterframes.datasource.stac.api.StacApiDataSource.{SEARCH_LIMIT_PARAM, SEARCH_FILTERS_PARAM, URI_PARAM}
 import org.locationtech.rasterframes.datasource.{intParam, jsonParam, uriParam}
 import sttp.model.Uri
 
@@ -36,6 +36,6 @@ object StacApiTable {
         .flatMap(_.as[SearchFilters].toOption)
         .getOrElse(SearchFilters(limit = NonNegInt.from(30).toOption))
 
-    def searchLimit: Option[NonNegInt] = intParam(ASSET_LIMIT_PARAM, options).flatMap(NonNegInt.from(_).toOption)
+    def searchLimit: Option[NonNegInt] = intParam(SEARCH_LIMIT_PARAM, options).flatMap(NonNegInt.from(_).toOption)
   }
 }

datasource/src/main/scala/org/locationtech/rasterframes/datasource/stac/api/package.scala

@@ -53,7 +53,7 @@ package object api {
         stacApi()
           .option(StacApiDataSource.URI_PARAM, uri)
           .option(StacApiDataSource.SEARCH_FILTERS_PARAM, filters.asJson.noSpaces)
-          .option(StacApiDataSource.ASSET_LIMIT_PARAM, searchLimit)
+          .option(StacApiDataSource.SEARCH_LIMIT_PARAM, searchLimit)
       )
   }
 }

pyrasterframes/src/main/python/pyrasterframes/__init__.py

@@ -268,7 +268,7 @@ def _stac_api_reader(
         .format("stac-api") \
         .option("uri", uri) \
         .option("search-filters", json.dumps(filters)) \
-        .option("asset-limit", search_limit) \
+        .option("search-limit", search_limit) \
         .load()
 
 def _geotiff_writer(