Refine CRS WKT parsing error message and test

Signed-off-by: Jason T. Brown <[email protected]>

Author: vpipkt

core/src/main/scala/org/locationtech/rasterframes/model/LazyCRS.scala

@@ -28,7 +28,7 @@ import org.locationtech.rasterframes.encoders.CatalystSerializer
 import org.locationtech.rasterframes.model.LazyCRS.EncodedCRS
 
 class LazyCRS(val encoded: EncodedCRS) extends CRS {
-  private lazy val delegate = LazyCRS.cache.get(encoded)
+  private lazy val delegate: CRS = LazyCRS.cache.get(encoded)
   override def proj4jCrs: CoordinateReferenceSystem = delegate.proj4jCrs
   override def toProj4String: String =
     if (encoded.startsWith("+proj")) encoded
@@ -50,11 +50,15 @@ object LazyCRS {
   trait ValidatedCRS
   type EncodedCRS = String with ValidatedCRS
 
+  val wktKeywords = Seq("GEOGCS", "PROJCS", "GEOCCS")
+
   @transient
   private lazy val mapper: PartialFunction[String, CRS] = {
     case e if e.toUpperCase().startsWith("EPSG")   => CRS.fromName(e) //not case-sensitive
     case p if p.startsWith("+proj")                => CRS.fromString(p) // case sensitive
-    case w if w.toUpperCase().startsWith("GEOGCS") => CRS.fromWKT(w) //only case-sensitive inside double quotes
+    case w if wktKeywords.exists{prefix ⇒
+      w.toUpperCase().startsWith(prefix)
+    } ⇒ CRS.fromWKT(w) //only case-sensitive inside double quotes
   }
 
   @transient
@@ -67,7 +71,7 @@ object LazyCRS {
       new LazyCRS(value.asInstanceOf[EncodedCRS])
     }
     else throw new IllegalArgumentException(
-      "crs string must be either EPSG code, +proj string, or OGC WKT")
+      s"CRS string must be either EPSG code, +proj string, or OGC WKT (WKT1). Argument value was ${if (value.length > 50) value.substring(0, 50) + "..." else value} ")
   }
 
   implicit val crsSererializer: CatalystSerializer[LazyCRS] = CatalystSerializer.crsSerializer.asInstanceOf[CatalystSerializer[LazyCRS]]

core/src/test/scala/org/locationtech/rasterframes/model/LazyCRSSpec.scala

@@ -27,6 +27,8 @@ import org.scalatest._
 class LazyCRSSpec extends FunSpec with Matchers {
   val sinPrj = "+proj=sinu +lon_0=0 +x_0=0 +y_0=0 +a=6371007.181 +b=6371007.181 +units=m +no_defs"
   val llPrj = "epsg:4326"
+
+
   describe("LazyCRS") {
     it("should implement equals") {
       LazyCRS(WebMercator) should be(LazyCRS(WebMercator))
@@ -39,5 +41,37 @@ class LazyCRSSpec extends FunSpec with Matchers {
       LatLng should be(LazyCRS(llPrj))
       LatLng should be(LazyCRS(LatLng))
     }
+    it("should interpret WKT1 GEOGCS correctly"){
+
+      // This is from geotrellis.proj4.io.wkt.WKT.fromEpsgCode(4326)
+      // Note it has subtle differences from other WKT1 forms
+      val wktWGS84 = "GEOGCS[\"WGS 84\", DATUM[\"World Geodetic System 1984\", SPHEROID[\"WGS 84\", 6378137.0, 298.257223563, AUTHORITY[\"EPSG\",\"7030\"]], AUTHORITY[\"EPSG\",\"6326\"]], PRIMEM[\"Greenwich\", 0.0, AUTHORITY[\"EPSG\",\"8901\"]], UNIT[\"degree\", 0.017453292519943295], AXIS[\"Geodetic longitude\", EAST], AXIS[\"Geodetic latitude\", NORTH], AUTHORITY[\"EPSG\",\"4326\"]]"
+
+      val crs = LazyCRS(wktWGS84)
+
+      crs.toProj4String should startWith("+proj=longlat")
+      crs.toProj4String should include("+datum=WGS84")
+    }
+
+    it("should interpret WKT1 PROJCS correctly") {
+
+      // Via geotrellis.proj4.io.wkt.WKT.fromEpsgCode
+      val wktUtm17N = "PROJCS[\"WGS 84 / UTM zone 17N\", GEOGCS[\"WGS 84\", DATUM[\"World Geodetic System 1984\", SPHEROID[\"WGS 84\", 6378137.0, 298.257223563, AUTHORITY[\"EPSG\",\"7030\"]], AUTHORITY[\"EPSG\",\"6326\"]], PRIMEM[\"Greenwich\", 0.0, AUTHORITY[\"EPSG\",\"8901\"]], UNIT[\"degree\", 0.017453292519943295], AXIS[\"Geodetic longitude\", EAST], AXIS[\"Geodetic latitude\", NORTH], AUTHORITY[\"EPSG\",\"4326\"]], PROJECTION[\"Transverse_Mercator\", AUTHORITY[\"EPSG\",\"9807\"]], PARAMETER[\"central_meridian\", -81.0], PARAMETER[\"latitude_of_origin\", 0.0], PARAMETER[\"scale_factor\", 0.9996], PARAMETER[\"false_easting\", 500000.0], PARAMETER[\"false_northing\", 0.0], UNIT[\"m\", 1.0], AXIS[\"Easting\", EAST], AXIS[\"Northing\", NORTH], AUTHORITY[\"EPSG\",\"32617\"]]"
+
+      val utm17n = LazyCRS(wktUtm17N)
+      utm17n.toProj4String should startWith("+proj=utm")
+      utm17n.toProj4String should include("+zone=17")
+      utm17n.toProj4String should include("+datum=WGS84")
+    }
+
+    ignore("should interpret WKT GEOCCS correctly"){
+      // geotrellis.proj4.io.wkt. WKT.fromEpsgCode(4978) gives this but
+      // .... fails on trying to instantiate
+      val wktWgsGeoccs = "GEOCCS[\"WGS 84\", DATUM[\"World Geodetic System 1984\", SPHEROID[\"WGS 84\", 6378137.0, 298.257223563, AUTHORITY[\"EPSG\",\"7030\"]], AUTHORITY[\"EPSG\",\"6326\"]], PRIMEM[\"Greenwich\", 0.0, AUTHORITY[\"EPSG\",\"8901\"]], UNIT[\"m\", 1.0], AXIS[\"Geocentric X\", GEOCENTRIC_X], AXIS[\"Geocentric Y\", GEOCENTRIC_Y], AXIS[\"Geocentric Z\", GEOCENTRIC_Z], AUTHORITY[\"EPSG\",\"4978\"]]"
+
+      val crs = LazyCRS(wktWgsGeoccs)
+      crs.toProj4String should startWith("+proj=geocent")
+      crs.toProj4String should include("+datum=WGS84")
+    }
   }
 }