Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GeoTrellisPath.parse should preserve unrecognized uri parameters #3529

Merged
merged 3 commits into from
Nov 22, 2023
Merged

GeoTrellisPath.parse should preserve unrecognized uri parameters #3529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d7fd2f
GeoTrellisPath.parse should preserve unrecognized uri parameters
pomadchin Nov 21, 2023
c2b11e9
Adjust tests
pomadchin Nov 21, 2023
4f9ecb9
CHANGELOG.md update
pomadchin Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix FileRangeReaderProvider parsing URI in windows [#3507](https://github.com/locationtech/geotrellis/pull/3507)
- Regrid: force crop to avoid going out of memory [#3518](https://github.com/locationtech/geotrellis/pull/3518)
- Fix rounding errors/numerical instability in GridExtent and LayoutTileSource [#3520](https://github.com/locationtech/geotrellis/pull/3520)
- GeoTrellisPath.parse should preserve unrecognized uri parameters [#3529](https://github.com/locationtech/geotrellis/pull/3529)

## [3.7.0] - 2023-02-26

Expand Down
19 changes: 12 additions & 7 deletions store/src/main/scala/geotrellis/store/GeoTrellisPath.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -70,13 +70,18 @@ object GeoTrellisPath {
case _ => ""
}

s"${scheme.split("\\+").last}://$authority${uri.path}".some
val queryStringFiltered = {
val filtered = queryString.removeAll(layerNameParam, zoomLevelParam, bandCountParam)
if(filtered.isEmpty) "" else s"?${filtered.toString()}"
}

s"${scheme.split("\\+").last}://$authority${uri.path}$queryStringFiltered".trim.some
}

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)) =>
Expand Down
24 changes: 19 additions & 5 deletions store/src/test/scala/geotrellis/store/GeoTrellisPathSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down Expand Up @@ -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") {
Expand All @@ -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")
Expand All @@ -92,9 +106,9 @@ class GeoTrellisPathSpec extends AnyFunSpec {
assert(path.layerName == "foo")
}

it("should ignore invalid parameters") {
it("should not 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))
}
}
}