Fixed failing tests after type resolution simplification

The simplification favoured placing the error on the first parameter, but we'd rather place it on the second.

Author: craigtaverner

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunction.java

@@ -192,13 +192,11 @@ protected TypeResolution resolveType(
             }
             TypeResolution resolution = isSameSpatialType(spatialExpression.dataType(), otherExpression, sourceText(), otherParamOrdinal);
             // TODO Remove these grid checks once we support geo_shape relation to geoGrid
-            if (resolution.resolved()) {
-                if (DataType.isGeoGrid(spatialExpression.dataType())) {
-                    resolution = isGeoPoint(otherExpression, otherParamOrdinal);
-                }
-                if (DataType.isGeoGrid(otherExpression.dataType())) {
-                    resolution = isGeoPoint(spatialExpression, otherParamOrdinal == FIRST ? SECOND : FIRST);
-                }
+            if (resolution.resolved() && DataType.isGeoGrid(spatialExpression.dataType())) {
+                resolution = isGeoPoint(otherExpression, otherParamOrdinal);
+            }
+            if (resolution.resolved() && DataType.isGeoGrid(otherExpression.dataType())) {
+                resolution = isGeoPoint(spatialExpression, otherParamOrdinal == FIRST ? SECOND : FIRST);
             }
             if (resolution.unresolved()) {
                 return resolution;