GeoTrellisPath.parse should preserve unrecognized uri parameters

Author: pomadchin

store/src/main/scala/geotrellis/store/GeoTrellisPath.scala

@@ -70,7 +70,12 @@ object GeoTrellisPath {
           case _ => ""
         }
 
-      s"${scheme.split("\\+").last}://$authority${uri.path}".some
+      val queryStringClean = {
+        val filtered = queryString.removeAll(layerNameParam, zoomLevelParam, bandCountParam)
+        if(filtered.isEmpty) "" else s"?${filtered.toString()}"
+      }
+
+      s"${scheme.split("\\+").last}://$authority${uri.path}$queryStringClean".trim.some
     }
 
     catalogPath.fold(Option.empty[GeoTrellisPath]) { catalogPath =>

store/src/test/scala/geotrellis/store/GeoTrellisPathSpec.scala

@@ -23,12 +23,12 @@ class GeoTrellisPathSpec extends AnyFunSpec {
 
     it("should fail to parse without a layer") {
       val path = GeoTrellisPath.parseOption("file:///foo/bar?zoom=1")
-      assert(path == None)
+      assert(path.isEmpty)
     }
 
     it("should fail to parse without a zoom") {
       val path = GeoTrellisPath.parseOption("file:///foo/bar?layer=baz")
-      assert(path == None)
+      assert(path.isEmpty)
     }
 
     it("should parse a local absolute file path without scheme") {
@@ -59,7 +59,7 @@ class GeoTrellisPathSpec extends AnyFunSpec {
       val path = GeoTrellisPath.parse("file:///foo/bar?layer=baz&band_count=1&zoom=10")
       assert(path.layerName == "baz")
       assert(path.zoomLevel == 10)
-      assert(path.bandCount == Some(1))
+      assert(path.bandCount.contains(1))
     }
 
     it("should parse hdfs scheme") {
@@ -74,6 +74,20 @@ class GeoTrellisPathSpec extends AnyFunSpec {
       assert(path.layerName == "foo")
     }
 
+    it("should parse hbase scheme") {
+      val path = GeoTrellisPath.parse("hbase://zookeeper:2181?master=master_host&attributes=attributes_table&layers=layers_table&layer=foo&zoom=1")
+      assert(path.value == "hbase://zookeeper:2181?master=master_host&attributes=attributes_table&layers=layers_table")
+      assert(path.layerName == "foo")
+      assert(path.zoomLevel == 1)
+    }
+
+    it("should parse accumulo scheme") {
+      val path = GeoTrellisPath.parse("accumulo://root:@localhost/fake?attributes=attributes&layers=tiles&layer=foo&zoom=1")
+      assert(path.value == "accumulo://root:@localhost/fake?attributes=attributes&layers=tiles")
+      assert(path.layerName == "foo")
+      assert(path.zoomLevel == 1)
+    }
+
     it("should parse absolute file scheme with gt+ prefix") {
       val path = GeoTrellisPath.parse("gt+file:///absolute/path?layer=foo&zoom=1")
       assert(path.value == "file:///absolute/path")