Disallow any geo_shape bounds other than BBOX

Also enhance tests to validate against actual bounds

Author: craigtaverner

docs/reference/query-languages/esql/_snippets/functions/parameters/st_geohash.md

@@ -144,7 +144,36 @@ gridGeohashStatsByBounds
 required_capability: spatial_grid
 
 FROM airports
-| EVAL geohash = ST_GEOHASH(location, 2, TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))"))
+| EVAL geohash = ST_GEOHASH(location, 2, TO_GEOSHAPE("BBOX(0.0, 12.0, 60.0, 30.0)"))
+| WHERE geohash IS NOT NULL
+| STATS
+    count = COUNT(*),
+    centroid = ST_CENTROID_AGG(location)
+      BY geohash
+| EVAL geohashString = ST_GEOHASH_TO_STRING(geohash)
+| KEEP count, centroid, geohashString
+| SORT count DESC, geohashString ASC
+;
+
+count:long | centroid:geo_point                            | geohashString:keyword
+19         | POINT (6.360728044651057 47.94084087577894)   | u0
+10         | POINT (15.350638423115015 47.80751353036612)  | u2
+9          | POINT (18.5217544157058 42.1394603792578)     | sr
+8          | POINT (6.351574736181647 51.8981519783847)    | u1
+7          | POINT (5.268637698941997 42.747250193330856)  | sp
+7          | POINT (17.092350951528974 53.365471504096476) | u3
+5          | POINT (16.2651440910995 58.812188878655434)   | u6
+4          | POINT (7.7012718468904495 36.39783004182391)  | sn
+3          | POINT (14.222751930356026 37.168446206487715) | sq
+3          | POINT (7.318722177296877 59.788265260867774)  | u4
+2          | POINT (16.706149326637387 32.37822346854955)  | sm
+;
+
+gridGeohashStatsByBoundsEnvelope
+required_capability: spatial_grid
+
+FROM airports
+| EVAL geohash = ST_GEOHASH(location, 2, ST_ENVELOPE(TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))")))
 | WHERE geohash IS NOT NULL
 | STATS
     count = COUNT(*),
@@ -393,7 +422,27 @@ gridGeotileStatsByBounds
 required_capability: spatial_grid
 
 FROM airports
-| EVAL geotile = ST_GEOTILE(location, 3, TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))"))
+| EVAL geotile = ST_GEOTILE(location, 3, TO_GEOSHAPE("BBOX(0.0, 12.0, 60.0, 30.0)"))
+| WHERE geotile IS NOT NULL
+| STATS
+    count = COUNT(*),
+    centroid = ST_CENTROID_AGG(location)
+      BY geotile
+| EVAL geotileString = ST_GEOTILE_TO_STRING(geotile)
+| SORT count DESC, geotileString ASC
+| KEEP count, centroid, geotileString
+;
+
+count:long | centroid:geo_point                           | geotileString:keyword
+100        | POINT (18.10569669920951 50.40505832391791)  | 3/4/2
+79         | POINT (24.516750878736943 23.93036561181085) | 3/4/3
+;
+
+gridGeotileStatsByBoundsEnvelope
+required_capability: spatial_grid
+
+FROM airports
+| EVAL geotile = ST_GEOTILE(location, 3, ST_ENVELOPE(TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))")))
 | WHERE geotile IS NOT NULL
 | STATS
     count = COUNT(*),
@@ -630,7 +679,36 @@ gridGeohexStatsByBounds
 required_capability: spatial_grid
 
 FROM airports
-| EVAL geohex = ST_GEOHEX(location, 1, TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))"))
+| EVAL geohex = ST_GEOHEX(location, 1, TO_GEOSHAPE("BBOX(0.0, 12.0, 60.0, 30.0)"))
+| WHERE geohex IS NOT NULL
+| STATS
+    count = COUNT(*),
+    centroid = ST_CENTROID_AGG(location)
+      BY geohex
+| EVAL geohexString = ST_GEOHEX_TO_STRING(geohex)
+| SORT count DESC, geohexString ASC
+| KEEP count, centroid, geohexString
+;
+
+count:long | centroid:geo_point                            | geohexString:keyword
+22         | POINT (7.250850197689777 48.21363834643059)   | 811fbffffffffff
+17         | POINT (-0.7606179875266903 52.86413913565304) | 81197ffffffffff
+7          | POINT (2.475211258445467 41.32352174592337)   | 81397ffffffffff
+6          | POINT (11.75047050230205 42.351422344800085)  | 811ebffffffffff
+5          | POINT (18.766171680763364 59.15833930950612)  | 8108bffffffffff
+5          | POINT (11.404999259859324 54.510593589395285) | 811f3ffffffffff
+4          | POINT (5.167026452254504 59.81037143385038)   | 8109bffffffffff
+4          | POINT (-1.1871178611181676 35.77457194332965) | 81383ffffffffff
+3          | POINT (-1.1497433669865131 45.83295159973204) | 81187ffffffffff
+3          | POINT (9.197671310976148 36.29719984252006)   | 81387ffffffffff
+1          | POINT (13.144258903339505 32.66916951164603)  | 813fbffffffffff
+;
+
+gridGeohexStatsByBoundsEnvelope
+required_capability: spatial_grid
+
+FROM airports
+| EVAL geohex = ST_GEOHEX(location, 1, ST_ENVELOPE(TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))")))
 | WHERE geohex IS NOT NULL
 | STATS
     count = COUNT(*),
@@ -659,7 +737,7 @@ gridGeohexQueryBounds
 required_capability: spatial_grid
 
 FROM airports
-| EVAL geohex = ST_GEOHEX(location, 1, TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))"))
+| EVAL geohex = ST_GEOHEX(location, 1, TO_GEOSHAPE("BBOX(0.0, 12.0, 60.0, 30.0)"))
 | WHERE ST_GEOHEX_TO_STRING(geohex) == "8108bffffffffff"
 | EVAL geohexString = ST_GEOHEX_TO_STRING(ST_GEOHEX(location, 1))
 | KEEP abbrev, location, geohexString
@@ -679,7 +757,7 @@ required_capability: spatial_grid
 
 FROM airports
 | WHERE abbrev IN ("RTW", "TIP", "XMN")
-| EVAL geohex = ST_GEOHEX(location, 1, TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))"))
+| EVAL geohex = ST_GEOHEX(location, 1, TO_GEOSHAPE("BBOX(0.0, 12.0, 60.0, 30.0)"))
 | EVAL geohexString = ST_GEOHEX_TO_STRING(geohex)
 | KEEP abbrev, location, geohex, geohexString
 | SORT abbrev ASC
@@ -698,7 +776,7 @@ ROW location = ["POINT (46.035023249891 51.5606456508842)", "POINT (13.144258981
 | MV_EXPAND location
 | EVAL location = TO_GEOPOINT(location)
 | EVAL geohex = ST_GEOHEX(location, 1)
-| EVAL geohexBounded = ST_GEOHEX(location, 1, TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))"))
+| EVAL geohexBounded = ST_GEOHEX(location, 1, TO_GEOSHAPE("BBOX(0.0, 12.0, 60.0, 30.0)"))
 | EVAL geohex = ST_GEOHEX_TO_STRING(geohex)
 | EVAL geohexBounded = ST_GEOHEX_TO_STRING(geohexBounded)
 | KEEP location, geohex, geohexBounded
@@ -773,7 +851,7 @@ FROM airports
 | STATS
     count = COUNT(location),
     centroid = ST_CENTROID_AGG(location)
-      BY ST_GEOHEX(location, 2, TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))"))
+      BY ST_GEOHEX(location, 2, ST_ENVELOPE(TO_GEOSHAPE("POLYGON((0.0 30.0, 12.0 30.0, 12.0 60.0, 0.0 60.0, 0.0 30.0))")))
 | WHERE count > 3
 | SORT count DESC
 | KEEP count, centroid

docs/reference/query-languages/esql/_snippets/functions/parameters/st_geohex.md

@@ -16,7 +16,6 @@
 import org.elasticsearch.compute.data.LongBlock;
 import org.elasticsearch.geometry.Point;
 import org.elasticsearch.geometry.Rectangle;
-import org.elasticsearch.geometry.utils.SpatialEnvelopeVisitor;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.function.scalar.ScalarFunction;
 import org.elasticsearch.xpack.esql.core.tree.Source;
@@ -125,11 +124,7 @@ protected static Rectangle asRectangle(BytesRef boundsBytesRef) {
         if (geometry instanceof Rectangle rectangle) {
             return rectangle;
         }
-        var envelope = SpatialEnvelopeVisitor.visitGeo(geometry, SpatialEnvelopeVisitor.WrapLongitude.WRAP);
-        if (envelope.isPresent()) {
-            return envelope.get();
-        }
-        throw new IllegalArgumentException("Cannot determine envelope of bounds geometry");
+        throw new IllegalArgumentException("Bounds geometry type '" + geometry.getClass().getSimpleName() + "' is not an envelope");
     }
 
     protected static GeoBoundingBox asGeoBoundingBox(Object bounds) {

docs/reference/query-languages/esql/_snippets/functions/parameters/st_geotile.md

@@ -98,6 +98,9 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvalua
 
     @Override
     public DataType dataType() {
+        if (dataType == null) {
+            resolveType();
+        }
         return dataType;
     }
 

docs/reference/query-languages/esql/kibana/definition/functions/st_geohash.json

@@ -119,8 +119,8 @@ public StGeohash(
             Expression of type `integer`. If `null`, the function returns `null`.
             Valid values are between [1 and 12](https://en.wikipedia.org/wiki/Geohash).""") Expression precision,
         @Param(name = "bounds", type = { "geo_shape" }, description = """
-            Optional bounds to filter the grid tiles, a `geo_shape`.
-            The envelope of the `geo_shape` is used as bounds.""", optional = true) Expression bounds
+            Optional bounds to filter the grid tiles, a `geo_shape` of type `BBOX`.
+            Use [`ST_ENVELOPE`](#esql-st_envelope) if the `geo_shape` is of any other type.""", optional = true) Expression bounds
     ) {
         this(source, field, precision, bounds, false);
     }