diff --git a/CHANGELOG.md b/CHANGELOG.md index d9a7fb5512..8b0832374e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/tags/TiffTags.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/tags/TiffTags.scala index 19a42cab41..fb631db1b1 100644 --- a/raster/src/main/scala/geotrellis/raster/io/geotiff/tags/TiffTags.scala +++ b/raster/src/main/scala/geotrellis/raster/io/geotiff/tags/TiffTags.scala @@ -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 => diff --git a/raster/src/main/scala/geotrellis/raster/io/json/Implicits.scala b/raster/src/main/scala/geotrellis/raster/io/json/Implicits.scala index 78310c1b39..c55e78726f 100644 --- a/raster/src/main/scala/geotrellis/raster/io/json/Implicits.scala +++ b/raster/src/main/scala/geotrellis/raster/io/json/Implicits.scala @@ -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 } diff --git a/spark-pipeline/src/main/scala/geotrellis/spark/pipeline/json/Implicits.scala b/spark-pipeline/src/main/scala/geotrellis/spark/pipeline/json/Implicits.scala index 9651b2745f..8e8b6452c5 100644 --- a/spark-pipeline/src/main/scala/geotrellis/spark/pipeline/json/Implicits.scala +++ b/spark-pipeline/src/main/scala/geotrellis/spark/pipeline/json/Implicits.scala @@ -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