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

Remove duplicate circe json codec #3181

Merged
merged 3 commits into from
Feb 7, 2020
Merged

Remove duplicate circe json codec #3181

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
7a59a43
Remove duplicate json codecs
Feb 7, 2020
da5ebc4
Remove private restriction on read overload
Feb 7, 2020
d094512
Update CHANGELOG
Feb 7, 2020
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Fix `PolygonRasterizer` failure on some inputs [#3160](https://github.com/locationtech/geotrellis/issues/3160)

### Removed

- Removed duplicate JSON codecs for `TileLayout` [#3181](https://github.com/locationtech/geotrellis/pull/3181)
- Removed `private` restriction for TiffTag `read` overload [#3181](https://github.com/locationtech/geotrellis/pull/3181)

## [3.2.0] - 2019-11-19

### Changed
Expand Down
2 changes: 1 addition & 1 deletion raster/src/main/scala/geotrellis/raster/io/geotiff/tags/TiffTags.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ object TiffTags {
}
}

private[geotrellis] def read(byteReader: ByteReader, tagsStartPosition: Long)(implicit ttos: TiffTagOffsetSize): TiffTags = {
def read(byteReader: ByteReader, tagsStartPosition: Long)(implicit ttos: TiffTagOffsetSize): TiffTags = {
val tagCount =
ttos match {
case IntTiffTagOffsetSize =>
Expand Down
2 changes: 0 additions & 2 deletions raster/src/main/scala/geotrellis/raster/io/json/Implicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,4 @@ trait Implicits extends HistogramJsonFormats {
Either.catchNonFatal(CellType.fromName(str)).leftMap(_ => "Expected CellType")
}

implicit val tileLayoutEncoder: Encoder[TileLayout] = deriveEncoder
implicit val tileLayoutDecoder: Decoder[TileLayout] = deriveDecoder
}
3 changes: 0 additions & 3 deletions spark-pipeline/src/main/scala/geotrellis/spark/pipeline/json/Implicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ trait Implicits {
Either.catchNonFatal(Try(CRS.fromName(str)) getOrElse CRS.fromString(str)).leftMap(_ => "CRS")
}

implicit val tileLayoutEncoder: Encoder[TileLayout] = deriveEncoder
implicit val tileLayoutDecoder: Decoder[TileLayout] = deriveDecoder

implicit val layoutDefinitionEncoder: Encoder[LayoutDefinition] = deriveEncoder
implicit val layoutDefinitionDecoder: Decoder[LayoutDefinition] = deriveDecoder

Expand Down