GeoTiffReader Unknown tags skip fix (#3557)

pomadchin · web-flow · commit a9f2d0c95600 · 2025-01-03T23:54:47.000-05:00
* GeoTiffReader Unknown tags skip fix

* CHANGELOG.md update
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update GDAL up to 3.9.x [#3540](https://github.com/locationtech/geotrellis/pull/3540)
 - Fix reprojection with downsampling for GeotiffRasterSource and tile RDDs. Reprojection outside the valid projection bounds may now throw a GeoAttrsError. [#3541](https://github.com/locationtech/geotrellis/issues/3541)
 - ConstantTile with NoData: support idempotent CellType conversions [#3553](https://github.com/locationtech/geotrellis/pull/3553)
+- GeoTiffReader Unknown tags skip fix [#3557](https://github.com/locationtech/geotrellis/pull/3557)
 
 ## [3.7.1] - 2024-01-08
 
diff --git a/raster/data/geotiff-test-files/unsupported-tiff-tags.tif b/raster/data/geotiff-test-files/unsupported-tiff-tags.tif
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
@@ -692,7 +692,7 @@ object TiffTags {
         readLongsTag(byteReader, tiffTags, tagMetadata)
       case (_, IFDOffset) =>
         readLongsTag(byteReader, tiffTags, tagMetadata)
-      case _ => TiffTags() // skip unsupported tags
+      case _ => tiffTags // skip unsupported tags
     }
   }
 
diff --git a/raster/src/test/scala/geotrellis/raster/io/geotiff/reader/GeoTiffReaderSpec.scala b/raster/src/test/scala/geotrellis/raster/io/geotiff/reader/GeoTiffReaderSpec.scala
@@ -508,6 +508,12 @@ class GeoTiffReaderSpec extends AnyFunSpec with Matchers with BeforeAndAfterAll
 
       geoTiff.options.subfileType should be (None)
     }
+
+    // https://github.com/locationtech/geotrellis/issues/3556
+    it("should skip unknown tags") {
+      val geotiff = GeoTiff.readMultiband(geoTiffPath("unsupported-tiff-tags.tif"))
+      geotiff.tags.headTags.size should be (2)
+    }
   }
 
   describe("Reading and writing special metadata tags ") {

Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ object TiffTags {`
`692`	`692`	`readLongsTag(byteReader, tiffTags, tagMetadata)`
`693`	`693`	`case (_, IFDOffset) =>`
`694`	`694`	`readLongsTag(byteReader, tiffTags, tagMetadata)`
`695`		`- case _ => TiffTags() // skip unsupported tags`
	`695`	`+ case _ => tiffTags // skip unsupported tags`
`696`	`696`	`}`
`697`	`697`	`}`
`698`	`698`
Original file line number	Diff line number	Diff line change
`@@ -508,6 +508,12 @@ class GeoTiffReaderSpec extends AnyFunSpec with Matchers with BeforeAndAfterAll`
`508`	`508`
`509`	`509`	`geoTiff.options.subfileType should be (None)`
`510`	`510`	`}`
	`511`	`+`
	`512`	`+ // https://github.com/locationtech/geotrellis/issues/3556`
	`513`	`+ it("should skip unknown tags") {`
	`514`	`+ val geotiff = GeoTiff.readMultiband(geoTiffPath("unsupported-tiff-tags.tif"))`
	`515`	`+ geotiff.tags.headTags.size should be (2)`
	`516`	`+ }`
`511`	`517`	`}`
`512`	`518`
`513`	`519`	`describe("Reading and writing special metadata tags ") {`