Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HSEARCH-4999 Use geo_shape instead of geo_polygon in Elasticsearch spatial predicates #3826

Merged
merged 1 commit into from
Nov 10, 2023
Merged

HSEARCH-4999 Use geo_shape instead of geo_polygon in Elasticsearch spatial predicates #3826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions ...lasticsearch/types/predicate/impl/ElasticsearchGeoPointSpatialWithinPolygonPredicate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@

public class ElasticsearchGeoPointSpatialWithinPolygonPredicate extends AbstractElasticsearchSingleFieldPredicate {

private static final JsonObjectAccessor GEO_POLYGON_ACCESSOR =
JsonAccessor.root().property( "geo_polygon" ).asObject();
private static final JsonObjectAccessor GEO_SHAPE_ACCESSOR =
JsonAccessor.root().property( "geo_shape" ).asObject();
private static final JsonAccessor<Boolean> IGNORE_UNMAPPED_ACCESSOR =
JsonAccessor.root().property( "ignore_unmapped" ).asBoolean();

private static final String POINTS_PROPERTY_NAME = "points";
private static final String COORDINATES_PROPERTY_NAME = "coordinates";
private static final String TYPE_PROPERTY_NAME = "type";
private static final String TYPE_PROPERTY_VALUE = "Polygon";
private static final String SHAPE_PROPERTY_NAME = "shape";

private final double[] coordinates;

Expand All @@ -42,25 +45,44 @@ private ElasticsearchGeoPointSpatialWithinPolygonPredicate(Builder builder) {
@Override
protected JsonObject doToJsonQuery(PredicateRequestContext context, JsonObject outerObject,
JsonObject innerObject) {
JsonObject pointsObject = new JsonObject();
JsonObject geometryObject = new JsonObject();
JsonArray pointsArray = new JsonArray();
for ( int i = 0; i < coordinates.length; i += 2 ) {
JsonArray point = new JsonArray();
point.add( coordinates[i] );
point.add( coordinates[i + 1] );
pointsArray.add( point );
}
pointsObject.add( POINTS_PROPERTY_NAME, pointsArray );

innerObject.add( absoluteFieldPath, pointsObject );
// GeoJSON Polygon has an array around the array of actual coordinates:
// "geometry": {
// "type": "Polygon",
// "coordinates": [
// [
// [100.0, 0.0],
// [101.0, 0.0],
// [101.0, 1.0],
// [100.0, 1.0],
// [100.0, 0.0]
// ]
// ]
// },
JsonArray coordinatesArray = new JsonArray();
coordinatesArray.add( pointsArray );
geometryObject.add( COORDINATES_PROPERTY_NAME, coordinatesArray );
// A GeoJSON shape; in our case we'll always have a Polygon:
geometryObject.addProperty( TYPE_PROPERTY_NAME, TYPE_PROPERTY_VALUE );

JsonObject shapeObject = new JsonObject();
shapeObject.add( SHAPE_PROPERTY_NAME, geometryObject );
innerObject.add( absoluteFieldPath, shapeObject );

if ( indexNames().size() > 1 ) {
// There are multiple target indexes; some of them may not declare the field.
// Instruct ES to behave as if the field had no value in that case.
IGNORE_UNMAPPED_ACCESSOR.set( innerObject, true );
}

GEO_POLYGON_ACCESSOR.set( outerObject, innerObject );
GEO_SHAPE_ACCESSOR.set( outerObject, innerObject );
return outerObject;
}

Expand Down
Loading