Fix our CRS Parser

locationtech · Oct 3, 2017 · 8bf5051 · 8bf5051
1 parent 306d0b0
commit 8bf5051
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/raster/data/geotiff-test-files/epsg31467.tif b/raster/data/geotiff-test-files/epsg31467.tif
diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/reader/GeoTiffCSParser.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/reader/GeoTiffCSParser.scala
@@ -580,7 +580,7 @@ class GeoTiffCSParser(geoKeyDirectory: GeoKeyDirectory) {
                       case None => (Some(semiMajor), None)
                     } else (Some(semiMajor), Some(semiMinor))
                   }
-                  case None => (Some(semiMajor), None)
+                  case _ => (Some(semiMajor), None)
                 }
               }
             } else (None, None)

diff --git a/raster/src/test/scala/geotrellis/raster/io/geotiff/writer/GeoTiffWriterSpec.scala b/raster/src/test/scala/geotrellis/raster/io/geotiff/writer/GeoTiffWriterSpec.scala
@@ -16,17 +16,15 @@
 
 package geotrellis.raster.io.geotiff.writer
 
-import geotrellis.proj4.{CRS, LatLng}
+import geotrellis.proj4.{CRS, LatLng, WebMercator}
 import geotrellis.raster._
 import geotrellis.raster.io.geotiff._
 import geotrellis.raster.io.geotiff.tags.TiffTags
 import geotrellis.raster.io.geotiff.tags.codes.ColorSpace
 import geotrellis.raster.render.{ColorRamps, IndexedColorMap}
 import geotrellis.raster.testkit._
 import geotrellis.vector.Extent
-
 import org.scalatest._
-
 import java.io._
 
 class GeoTiffWriterSpec extends FunSpec
@@ -118,6 +116,16 @@ class GeoTiffWriterSpec extends FunSpec
       actualCRS.toProj4String should be (geoTiff.crs.toProj4String)
     }
 
+    it ("should write DHDN_3_Degree_Gauss_Zone_3 correctly") {
+      val geoTiff = MultibandGeoTiff(geoTiffPath("epsg31467.tif"))
+
+      addToPurge(path)
+      geoTiff.write(path)
+      val actualCRS = SinglebandGeoTiff(path).crs
+
+      actualCRS.toProj4String should be (geoTiff.crs.toProj4String)
+    }
+
     it("should write floating point rasters correctly") {
       val t = DoubleArrayTile(Array(11.0, 22.0, 33.0, 44.0), 2, 2)