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

handle degenerated rectangles while indexing (#64122) #64204

Merged
merged 1 commit into from
Oct 27, 2020
Merged

handle degenerated rectangles while indexing (#64122) #64204

Show file tree
Hide file tree
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
30 changes: 23 additions & 7 deletions server/src/main/java/org/elasticsearch/index/mapper/GeoShapeIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,29 @@ public Void visit(Polygon polygon) {

@Override
public Void visit(Rectangle r) {
if (r.getMinLon() > r.getMaxLon()) {
Rectangle left = new Rectangle(r.getMinLon(), GeoUtils.MAX_LON, r.getMaxLat(), r.getMinLat());
addFields(LatLonShape.createIndexableFields(name, GeoShapeUtils.toLucenePolygon(left)));
Rectangle right = new Rectangle(GeoUtils.MIN_LON, r.getMaxLon(), r.getMaxLat(), r.getMinLat());
addFields(LatLonShape.createIndexableFields(name, GeoShapeUtils.toLucenePolygon(right)));

} else {
if (r.getMinLon() > r.getMaxLon()) {
if (r.getMinLon() == GeoUtils.MAX_LON) {
Line line = new Line(new double[] {GeoUtils.MAX_LON, GeoUtils.MAX_LON}, new double[] {r.getMaxLat(), r.getMinLat()});
visit(line);
} else {
Rectangle left = new Rectangle(r.getMinLon(), GeoUtils.MAX_LON, r.getMaxLat(), r.getMinLat());
visit(left);
}
if (r.getMaxLon() == GeoUtils.MIN_LON) {
Line line = new Line(new double[] {GeoUtils.MIN_LON, GeoUtils.MIN_LON}, new double[] {r.getMaxLat(), r.getMinLat()});
visit(line);
} else {
Rectangle right = new Rectangle(GeoUtils.MIN_LON, r.getMaxLon(), r.getMaxLat(), r.getMinLat());
visit(right);
}
} else if (r.getMinLon() == r.getMaxLon() || r.getMinLat() == r.getMaxLat()) {
if (r.getMinLat() == r.getMaxLat()) {
addFields(LatLonShape.createIndexableFields(name, r.getMinLat(), r.getMinLon()));
} else {
Line line = new Line(new double[]{r.getMinLon(), r.getMaxLon()}, new double[]{r.getMaxLat(), r.getMinLat()});
visit(line);
}
} else {
addFields(LatLonShape.createIndexableFields(name, GeoShapeUtils.toLucenePolygon(r)));
}
return null;
Expand Down
60 changes: 60 additions & 0 deletions server/src/test/java/org/elasticsearch/common/geo/GeometryIndexerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,66 @@ public void testRectangle() {
assertEquals(fields.size(), 4);
}

public void testDegeneratedRectangles() {
Rectangle indexed = new Rectangle(-179, -179, 10, -10);
Geometry processed = indexer.prepareForIndexing(indexed);
assertEquals(indexed, processed);

// Rectangle is a line
List<IndexableField> fields = indexer.indexShape(null, indexed);
assertEquals(fields.size(), 1);

indexed = new Rectangle(-179, -178, 10, 10);
processed = indexer.prepareForIndexing(indexed);
assertEquals(indexed, processed);

// Rectangle is a line
fields = indexer.indexShape(null, indexed);
assertEquals(fields.size(), 1);

indexed = new Rectangle(-179, -179, 10, 10);
processed = indexer.prepareForIndexing(indexed);
assertEquals(indexed, processed);

// Rectangle is a point
fields = indexer.indexShape(null, indexed);
assertEquals(fields.size(), 1);

indexed = new Rectangle(180, -179, 10, -10);
processed = indexer.prepareForIndexing(indexed);
assertEquals(indexed, processed);

// Rectangle crossing the dateline, one side is a line
fields = indexer.indexShape(null, indexed);
assertEquals(fields.size(), 3);

indexed = new Rectangle(180, -179, 10, 10);
processed = indexer.prepareForIndexing(indexed);
assertEquals(indexed, processed);

// Rectangle crossing the dateline, one side is a point,
// other side a line
fields = indexer.indexShape(null, indexed);
assertEquals(fields.size(), 2);

indexed = new Rectangle(-178, -180, 10, -10);
processed = indexer.prepareForIndexing(indexed);
assertEquals(indexed, processed);

// Rectangle crossing the dateline, one side is a line
fields = indexer.indexShape(null, indexed);
assertEquals(fields.size(), 3);

indexed = new Rectangle(-178, -180, 10, 10);
processed = indexer.prepareForIndexing(indexed);
assertEquals(indexed, processed);

// Rectangle crossing the dateline, one side is a point,
// other side a line
fields = indexer.indexShape(null, indexed);
assertEquals(fields.size(), 2);
}

public void testPolygon() {
Polygon polygon = new Polygon(new LinearRing(new double[]{160, 200, 200, 160, 160}, new double[]{10, 10, 20, 20, 10}));
Geometry indexed = new MultiPolygon(Arrays.asList(
Expand Down