Reshapes the code a bit

Author: ncordon

x-pack/plugin/esql-core/build.gradle

@@ -16,6 +16,7 @@ base {
 dependencies {
   api "org.antlr:antlr4-runtime:${versions.antlr4}"
   api project(path: xpackModule('mapper-version'))
+  api "org.locationtech.jts:jts-core:${versions.jts}"
   compileOnly project(path: xpackModule('core'))
   testApi(project(xpackModule('esql-core:test-fixtures'))) {
     exclude group: 'org.elasticsearch.plugin', module: 'esql-core'

x-pack/plugin/esql/licenses/jts-core-LICENSE.txt renamed to x-pack/plugin/esql-core/licenses/jts-core-LICENSE.txt

@@ -16,6 +16,9 @@
 import org.elasticsearch.geometry.utils.GeometryValidator;
 import org.elasticsearch.geometry.utils.WellKnownBinary;
 import org.elasticsearch.geometry.utils.WellKnownText;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKTWriter;
 
 import java.nio.ByteOrder;
 
@@ -125,4 +128,17 @@ public String wkbToWkt(BytesRef wkb) {
     public Geometry wkbToGeometry(BytesRef wkb) {
         return WellKnownBinary.fromWKB(validator(), false, wkb.bytes, wkb.offset, wkb.length);
     }
+
+    public org.locationtech.jts.geom.Geometry wkbToJtsGeometry(BytesRef wkb) throws ParseException {
+        String wkt = wkbToWkt(wkb);
+        WKTReader reader = new WKTReader();
+        return reader.read(wkt);
+    }
+
+    public BytesRef jtsGeometryToWkb(org.locationtech.jts.geom.Geometry jtsGeometry) {
+        WKTWriter writer = new WKTWriter();
+        String wkt = writer.write(jtsGeometry);
+        return wktToWkb(wkt);
+    }
+
 }

x-pack/plugin/esql/licenses/jts-core-NOTICE.txt renamed to x-pack/plugin/esql-core/licenses/jts-core-NOTICE.txt

@@ -37,7 +37,6 @@ dependencies {
   compileOnly project(xpackModule('ml'))
   compileOnly project(path: xpackModule('mapper-aggregate-metric'))
   compileOnly project(path: xpackModule('downsample'))
-  implementation "org.locationtech.jts:jts-core:${versions.jts}"
   implementation project(xpackModule('kql'))
   implementation project('compute')
   implementation project('compute:ann')

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/SpatialCoordinateTypes.java

@@ -23,8 +23,6 @@
 import org.elasticsearch.xpack.esql.expression.function.Param;
 import org.elasticsearch.xpack.esql.expression.function.scalar.EsqlScalarFunction;
 import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;
-import org.locationtech.jts.io.WKTReader;
-import org.locationtech.jts.io.WKTWriter;
 import org.locationtech.jts.simplify.DouglasPeuckerSimplifier;
 
 import java.io.IOException;
@@ -93,20 +91,13 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeNamedWriteable(tolerance);
     }
 
-    private static class GeoSimplifier {
-        static WKTReader reader = new WKTReader();
-        static WKTWriter writer = new WKTWriter();
-
-        public static BytesRef geoSourceAndConstantTolerance(BytesRef inputGeometry, @Fixed double inputTolerance) {
-            String wkt = UNSPECIFIED.wkbToWkt(inputGeometry);
-            try {
-                org.locationtech.jts.geom.Geometry jtsGeometry = reader.read(wkt);
-                org.locationtech.jts.geom.Geometry simplifiedGeometry = DouglasPeuckerSimplifier.simplify(jtsGeometry, inputTolerance);
-                String simplifiedWkt = writer.write(simplifiedGeometry);
-                return UNSPECIFIED.wktToWkb(simplifiedWkt);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+    private static BytesRef geoSourceAndConstantTolerance(BytesRef inputGeometry, double inputTolerance) {
+        try {
+            org.locationtech.jts.geom.Geometry jtsGeometry = UNSPECIFIED.wkbToJtsGeometry(inputGeometry);
+            org.locationtech.jts.geom.Geometry simplifiedGeometry = DouglasPeuckerSimplifier.simplify(jtsGeometry, inputTolerance);
+            return UNSPECIFIED.jtsGeometryToWkb(simplifiedGeometry);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -128,11 +119,11 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvalua
 
     @Evaluator(extraName = "NonFoldableGeoAndConstantTolerance", warnExceptions = { IllegalArgumentException.class })
     static BytesRef processNonFoldableGeoAndConstantTolerance(BytesRef inputGeometry, @Fixed double inputTolerance) {
-        return GeoSimplifier.geoSourceAndConstantTolerance(inputGeometry, inputTolerance);
+        return geoSourceAndConstantTolerance(inputGeometry, inputTolerance);
     }
 
     @Evaluator(extraName = "FoldableGeoAndConstantTolerance", warnExceptions = { IllegalArgumentException.class })
     static BytesRef processFoldableGeoAndConstantTolerance(@Fixed BytesRef inputGeometry, @Fixed double inputTolerance) {
-        return GeoSimplifier.geoSourceAndConstantTolerance(inputGeometry, inputTolerance);
+        return geoSourceAndConstantTolerance(inputGeometry, inputTolerance);
     }
 }