elastic · craigtaverner · Dec 15, 2025 · Dec 16, 2025 · Dec 16, 2025 · Dec 16, 2025
diff --git a/docs/changelog/139618.yaml b/docs/changelog/139618.yaml
@@ -0,0 +1,5 @@
+pr: 139618
+summary: Various fixes to spatial functions (ST_ENVELOPE and ST_NPOINTS)
+area: ES|QL
+type: enhancement
+issues: []
diff --git a/docs/reference/query-languages/esql/_snippets/functions/description/st_npoints.md b/docs/reference/query-languages/esql/_snippets/functions/description/st_npoints.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/examples/st_npoints.md b/docs/reference/query-languages/esql/_snippets/functions/examples/st_npoints.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_contains.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_contains.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_disjoint.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_disjoint.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_distance.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_distance.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_geohash.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_geohash.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_geohex.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_geohex.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_geotile.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_geotile.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_intersects.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_intersects.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_npoints.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_npoints.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_within.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_within.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_x.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_x.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/layout/st_y.md b/docs/reference/query-languages/esql/_snippets/functions/layout/st_y.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/parameters/st_npoints.md b/docs/reference/query-languages/esql/_snippets/functions/parameters/st_npoints.md
diff --git a/docs/reference/query-languages/esql/_snippets/functions/types/st_npoints.md b/docs/reference/query-languages/esql/_snippets/functions/types/st_npoints.md
diff --git a/docs/reference/query-languages/esql/_snippets/lists/spatial-functions.md b/docs/reference/query-languages/esql/_snippets/lists/spatial-functions.md
@@ -1,15 +1,19 @@
-* [`ST_DISTANCE`](../../functions-operators/spatial-functions.md#esql-st_distance)
-* [`ST_INTERSECTS`](../../functions-operators/spatial-functions.md#esql-st_intersects)
-* [`ST_DISJOINT`](../../functions-operators/spatial-functions.md#esql-st_disjoint)
-* [`ST_CONTAINS`](../../functions-operators/spatial-functions.md#esql-st_contains)
-* [`ST_WITHIN`](../../functions-operators/spatial-functions.md#esql-st_within)
-* [`ST_X`](../../functions-operators/spatial-functions.md#esql-st_x)
-* [`ST_Y`](../../functions-operators/spatial-functions.md#esql-st_y)
+* Geospatial predicates
+  * [`ST_DISTANCE`](../../functions-operators/spatial-functions.md#esql-st_distance)
+  * [`ST_INTERSECTS`](../../functions-operators/spatial-functions.md#esql-st_intersects)
+  * [`ST_DISJOINT`](../../functions-operators/spatial-functions.md#esql-st_disjoint)
+  * [`ST_CONTAINS`](../../functions-operators/spatial-functions.md#esql-st_contains)
+  * [`ST_WITHIN`](../../functions-operators/spatial-functions.md#esql-st_within)
+* Geometry functions
+  * [`ST_X`](../../functions-operators/spatial-functions.md#esql-st_x)
+  * [`ST_Y`](../../functions-operators/spatial-functions.md#esql-st_y)
+  * [`ST_NPOINTS`](../../functions-operators/spatial-functions.md#esql-st_npoints) {applies_to}`stack: preview` {applies_to}`serverless: preview`
 * [`ST_ENVELOPE`](../../functions-operators/spatial-functions.md#esql-st_envelope) {applies_to}`stack: preview` {applies_to}`serverless: preview`
   * [`ST_XMAX`](../../functions-operators/spatial-functions.md#esql-st_xmax) {applies_to}`stack: preview` {applies_to}`serverless: preview`
   * [`ST_XMIN`](../../functions-operators/spatial-functions.md#esql-st_xmin) {applies_to}`stack: preview` {applies_to}`serverless: preview`
   * [`ST_YMAX`](../../functions-operators/spatial-functions.md#esql-st_ymax) {applies_to}`stack: preview` {applies_to}`serverless: preview`
   * [`ST_YMIN`](../../functions-operators/spatial-functions.md#esql-st_ymin) {applies_to}`stack: preview` {applies_to}`serverless: preview`
-* [`ST_GEOTILE`](../../functions-operators/spatial-functions.md#esql-st_geotile) {applies_to}`stack: preview` {applies_to}`serverless: preview`
-* [`ST_GEOHEX`](../../functions-operators/spatial-functions.md#esql-st_geohex) {applies_to}`stack: preview` {applies_to}`serverless: preview`
-* [`ST_GEOHASH`](../../functions-operators/spatial-functions.md#esql-st_geohash) {applies_to}`stack: preview` {applies_to}`serverless: preview`
+* Grid encoding functions
+  * [`ST_GEOTILE`](../../functions-operators/spatial-functions.md#esql-st_geotile) {applies_to}`stack: preview` {applies_to}`serverless: preview`
+  * [`ST_GEOHEX`](../../functions-operators/spatial-functions.md#esql-st_geohex) {applies_to}`stack: preview` {applies_to}`serverless: preview`
+  * [`ST_GEOHASH`](../../functions-operators/spatial-functions.md#esql-st_geohash) {applies_to}`stack: preview` {applies_to}`serverless: preview`
diff --git a/docs/reference/query-languages/esql/functions-operators/spatial-functions.md b/docs/reference/query-languages/esql/functions-operators/spatial-functions.md
@@ -14,6 +14,7 @@ mapped_pages:
 :::{include} ../_snippets/lists/spatial-functions.md
 :::
 
+## Geospatial predicates
 
 :::{include} ../_snippets/functions/layout/st_distance.md
 :::
@@ -30,12 +31,17 @@ mapped_pages:
 :::{include} ../_snippets/functions/layout/st_within.md
 :::
 
+## Geometry functions
+
 :::{include} ../_snippets/functions/layout/st_x.md
 :::
 
 :::{include} ../_snippets/functions/layout/st_y.md
 :::
 
+:::{include} ../_snippets/functions/layout/st_npoints.md
+:::
+
 :::{include} ../_snippets/functions/layout/st_envelope.md
 :::
 
@@ -51,6 +57,8 @@ mapped_pages:
 :::{include} ../_snippets/functions/layout/st_ymin.md
 :::
 
+## Grid encoding functions
+
 :::{include} ../_snippets/functions/layout/st_geotile.md
 :::
 

diff --git a/docs/reference/query-languages/esql/images/functions/st_npoints.svg b/docs/reference/query-languages/esql/images/functions/st_npoints.svg
diff --git a/docs/reference/query-languages/esql/kibana/definition/functions/st_npoints.json b/docs/reference/query-languages/esql/kibana/definition/functions/st_npoints.json
diff --git a/docs/reference/query-languages/esql/kibana/docs/functions/st_npoints.md b/docs/reference/query-languages/esql/kibana/docs/functions/st_npoints.md
diff --git a/...search/geo/GeometryPointCountVisitor.java → ...etry/utils/GeometryPointCountVisitor.java b/...search/geo/GeometryPointCountVisitor.java → ...etry/utils/GeometryPointCountVisitor.java
@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-package org.elasticsearch.geo;
+package org.elasticsearch.geometry.utils;
 
 import org.elasticsearch.geometry.Circle;
 import org.elasticsearch.geometry.Geometry;

diff --git a/test/framework/src/main/java/org/elasticsearch/geo/GeometryTestUtils.java b/test/framework/src/main/java/org/elasticsearch/geo/GeometryTestUtils.java
@@ -23,6 +23,7 @@
 import org.elasticsearch.geometry.Polygon;
 import org.elasticsearch.geometry.Rectangle;
 import org.elasticsearch.geometry.ShapeType;
+import org.elasticsearch.geometry.utils.GeometryPointCountVisitor;
 import org.elasticsearch.test.ESTestCase;
 
 import java.util.ArrayList;

diff --git a/test/framework/src/main/java/org/elasticsearch/geo/ShapeTestUtils.java b/test/framework/src/main/java/org/elasticsearch/geo/ShapeTestUtils.java
@@ -21,6 +21,7 @@
 import org.elasticsearch.geometry.Point;
 import org.elasticsearch.geometry.Polygon;
 import org.elasticsearch.geometry.Rectangle;
+import org.elasticsearch.geometry.utils.GeometryPointCountVisitor;
 import org.elasticsearch.test.ESTestCase;
 
 import java.util.ArrayList;