Adjust tests

locationtech · Nov 21, 2023 · 7e05535 · 7e05535
1 parent 5d7fd2f
commit 7e05535
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/store/src/main/scala/geotrellis/store/GeoTrellisPath.scala b/store/src/main/scala/geotrellis/store/GeoTrellisPath.scala
@@ -55,9 +55,9 @@ object GeoTrellisPath {
   implicit def toGeoTrellisDataPath(path: String): GeoTrellisPath = parse(path)
 
   def parseOption(path: String): Option[GeoTrellisPath] = {
-    val layerNameParam: String = "layer"
-    val zoomLevelParam: String = "zoom"
-    val bandCountParam: String = "band_count"
+    val layerNameParam = "layer"
+    val zoomLevelParam = "zoom"
+    val bandCountParam = "band_count"
 
     val uri = UrlWithAuthority.parseOption(path).fold(Url.parse(path))(identity)
     val queryString = uri.query
@@ -79,9 +79,9 @@ object GeoTrellisPath {
     }
 
     catalogPath.fold(Option.empty[GeoTrellisPath]) { catalogPath =>
-      val maybeLayerName: Option[String] = queryString.param(layerNameParam)
-      val maybeZoomLevel: Option[Int] = queryString.param(zoomLevelParam).map(_.toInt)
-      val bandCount: Option[Int] = queryString.param(bandCountParam).map(_.toInt)
+      val maybeLayerName = queryString.param(layerNameParam)
+      val maybeZoomLevel = queryString.param(zoomLevelParam).map(_.toInt)
+      val bandCount = queryString.param(bandCountParam).map(_.toInt)
 
       (maybeLayerName, maybeZoomLevel) match {
         case (Some(layerName), Some(zoomLevel)) =>

diff --git a/store/src/test/scala/geotrellis/store/GeoTrellisPathSpec.scala b/store/src/test/scala/geotrellis/store/GeoTrellisPathSpec.scala
@@ -108,7 +108,7 @@ class GeoTrellisPathSpec extends AnyFunSpec {
 
     it("should ignore invalid parameters") {
       val path = GeoTrellisPath.parse("file:///foo/bar?layer=baz&zoom=1&invalid=not&nope=1")
-      assert(path == GeoTrellisPath("file:///foo/bar", "baz", 1, None))
+      assert(path == GeoTrellisPath("file:///foo/bar?invalid=not&nope=1", "baz", 1, None))
     }
   }
 }