Merge pull request #99 from databricks/feature/crs-transforms

Fix the problem introduced to main.
databrickslabs · Apr 9, 2022 · 33fe969 · 33fe969
2 parents 224a0a7 + fb6ee05
commit 33fe969
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 56 deletions.
diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/geometry/RequiresCRS.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/geometry/RequiresCRS.scala
@@ -16,7 +16,7 @@ trait RequiresCRS {
             case HexType              => "HEX"
             case JSONType             => "GEOJSON"
             case InternalGeometryType => "COORDS"
-            case _                    => ???
+            case _                    => throw new Error("Format not supported!")
         }
 
     def checkEncoding(dataType: DataType): Unit = {

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/geometry/ST_SetSRID.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/geometry/ST_SetSRID.scala
@@ -34,33 +34,6 @@ case class ST_SetSRID(inputGeom: Expression, srid: Expression, geometryAPIName:
 
     override def right: Expression = srid
 
-//    override protected def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode =
-//        nullSafeCodeGen(
-//            ctx,
-//            ev,
-//            leftEval => {
-//                checkEncoding(inputGeom.dataType)
-//                val geometryAPI = GeometryAPI.apply(geometryAPIName)
-//                val (inCode, geomInRef) = ConvertToCodeGen.readGeometryCode(ctx, leftEval, inputGeom.dataType, geometryAPI)
-//
-//                geometryAPIName match {
-//                    case "ESRI" => s"""
-//                                      |$inCode
-//                                      |${ev.value} = $geomInRef.setEsriSpatialReference().getID();
-//                                      |""".stripMargin
-//                    case "JTS" => s"""
-//                                     |try {
-//                                     |$inCode
-//                                     |${ev.value} = $geomInRef.setSRID($);
-//                                     |} catch (Exception e) {
-//                                     | throw e;
-//                                     |}
-//                                     |""".stripMargin
-//
-//                }
-//            }
-//        )
-
     override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression =
         copy(inputGeom = newLeft, srid = newRight)
 

diff --git a/src/main/scala/com/databricks/labs/mosaic/expressions/geometry/ST_Transform.scala b/src/main/scala/com/databricks/labs/mosaic/expressions/geometry/ST_Transform.scala
@@ -34,33 +34,6 @@ case class ST_Transform(inputGeom: Expression, srid: Expression, geometryAPIName
 
     override def right: Expression = srid
 
-//    override protected def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode =
-//        nullSafeCodeGen(
-//            ctx,
-//            ev,
-//            leftEval => {
-//                checkEncoding(inputGeom.dataType)
-//                val geometryAPI = GeometryAPI.apply(geometryAPIName)
-//                val (inCode, geomInRef) = ConvertToCodeGen.readGeometryCode(ctx, leftEval, inputGeom.dataType, geometryAPI)
-//
-//                geometryAPIName match {
-//                    case "ESRI" => s"""
-//                                      |$inCode
-//                                      |${ev.value} = $geomInRef.setEsriSpatialReference().getID();
-//                                      |""".stripMargin
-//                    case "JTS" => s"""
-//                                     |try {
-//                                     |$inCode
-//                                     |${ev.value} = $geomInRef.setSRID($);
-//                                     |} catch (Exception e) {
-//                                     | throw e;
-//                                     |}
-//                                     |""".stripMargin
-//
-//                }
-//            }
-//        )
-
     override protected def withNewChildrenInternal(newLeft: Expression, newRight: Expression): Expression =
         copy(inputGeom = newLeft, srid = newRight)
 

diff --git a/src/test/scala/com/databricks/labs/mosaic/sql/MosaicFrameBehaviors.scala b/src/test/scala/com/databricks/labs/mosaic/sql/MosaicFrameBehaviors.scala
@@ -52,7 +52,7 @@ trait MosaicFrameBehaviors { this: AnyFlatSpec =>
             .setIndexResolution(3)
             .applyIndex()
 
-        val mdf2 = MosaicFrame(polyDf(spark), "geometry")
+        val mdf2 = MosaicFrame(polyDf(spark).limit(1), "geometry")
             .setIndexResolution(3)
             .applyIndex()