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

LUCENE-8632: New XYShape Field and Queries for indexing and searching general cartesian geometries #726

Closed
wants to merge 13 commits into from
Closed

LUCENE-8632: New XYShape Field and Queries for indexing and searching general cartesian geometries #726

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
efd3f18
add xyshape support
nknize Feb 6, 2019
ef006a2
add XYEncodingUtils
nknize Mar 11, 2019
27fd07b
add XYShape testing framework based on LatLonShape
nknize May 1, 2019
937fa5d
code cleanup and javadocs
nknize Jun 17, 2019
1c982b9
remove extends ShapeField from XYShape and LatLonShape, clean up basi…
nknize Jun 26, 2019
4d0c96f
change XYPolygon and XYLine API to accept floats instead of doubles
nknize Jun 26, 2019
64f0c4c
Merge branch 'master' into xyshape
nknize Jul 1, 2019
7ffd14a
refactor XYRectangle2D to derive from Rectangle2D
nknize Jul 1, 2019
603a9f4
refactor TestLatLonShapeEncoding to a BaseShapeEncodingTestCase and c…
nknize Jul 8, 2019
1dec6e2
API and class cleanup
nknize Jul 8, 2019
64517b2
Merge branch 'master' into xyshape
nknize Jul 8, 2019
9a4a87f
Refactor Tessellator.Triangle getLat / getLon methods to getY / getX,…
nknize Jul 8, 2019
7f79310
Update CHANGES.txt
nknize Jul 8, 2019
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
12 changes: 8 additions & 4 deletions lucene/core/src/java/org/apache/lucene/geo/Polygon2D.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,22 @@
*/
// Both Polygon.contains() and Polygon.crossesSlowly() loop all edges, and first check that the edge is within a range.
// we just organize the edges to do the same computations on the same subset of edges more efficiently.
public final class Polygon2D extends EdgeTree {
public class Polygon2D extends EdgeTree {
// each component/hole is a node in an augmented 2d kd-tree: we alternate splitting between latitude/longitude,
// and pull up max values for both dimensions to each parent node (regardless of split).
/** tree of holes, or null */
private final Polygon2D holes;
protected final Polygon2D holes;
private final AtomicBoolean containsBoundary = new AtomicBoolean(false);

private Polygon2D(Polygon polygon, Polygon2D holes) {
super(polygon.minLat, polygon.maxLat, polygon.minLon, polygon.maxLon, polygon.getPolyLats(), polygon.getPolyLons());
protected Polygon2D(final double minLat, final double maxLat, final double minLon, final double maxLon, double[] lats, double[] lons, Polygon2D holes) {
super(minLat, maxLat, minLon, maxLon, lats, lons);
this.holes = holes;
}

protected Polygon2D(Polygon polygon, Polygon2D holes) {
this(polygon.minLat, polygon.maxLat, polygon.minLon, polygon.maxLon, polygon.getPolyLats(), polygon.getPolyLons(), holes);
}

/**
* Returns true if the point is contained within this polygon.
* <p>
Expand Down
311 changes: 27 additions & 284 deletions lucene/sandbox/src/java/org/apache/lucene/document/LatLonShape.java
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions lucene/sandbox/src/java/org/apache/lucene/document/LatLonShapeBoundingBoxQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,24 @@
*/
package org.apache.lucene.document;

import org.apache.lucene.document.ShapeField.QueryRelation;
import org.apache.lucene.geo.Rectangle;
import org.apache.lucene.geo.Rectangle2D;
import org.apache.lucene.index.PointValues.Relation;

/**
* Finds all previously indexed shapes that intersect the specified bounding box.
* Finds all previously indexed geo shapes that intersect the specified bounding box.
*
* <p>The field must be indexed using
* {@link org.apache.lucene.document.LatLonShape#createIndexableFields} added per document.
*
* @lucene.experimental
**/
final class LatLonShapeBoundingBoxQuery extends LatLonShapeQuery {
final class LatLonShapeBoundingBoxQuery extends ShapeQuery {
final Rectangle rectangle;
final Rectangle2D rectangle2D;

public LatLonShapeBoundingBoxQuery(String field, LatLonShape.QueryRelation queryRelation, double minLat, double maxLat, double minLon, double maxLon) {
public LatLonShapeBoundingBoxQuery(String field, QueryRelation queryRelation, double minLat, double maxLat, double minLon, double maxLon) {
super(field, queryRelation);
this.rectangle = new Rectangle(minLat, maxLat, minLon, maxLon);
this.rectangle2D = Rectangle2D.create(this.rectangle);
Expand All @@ -46,9 +47,9 @@ protected Relation relateRangeBBoxToQuery(int minXOffset, int minYOffset, byte[]

/** returns true if the query matches the encoded triangle */
@Override
protected boolean queryMatches(byte[] t, int[] scratchTriangle, LatLonShape.QueryRelation queryRelation) {
protected boolean queryMatches(byte[] t, int[] scratchTriangle, QueryRelation queryRelation) {
// decode indexed triangle
LatLonShape.decodeTriangle(t, scratchTriangle);
ShapeField.decodeTriangle(t, scratchTriangle);

int aY = scratchTriangle[0];
int aX = scratchTriangle[1];
Expand All @@ -57,7 +58,7 @@ protected boolean queryMatches(byte[] t, int[] scratchTriangle, LatLonShape.Quer
int cY = scratchTriangle[4];
int cX = scratchTriangle[5];

if (queryRelation == LatLonShape.QueryRelation.WITHIN) {
if (queryRelation == QueryRelation.WITHIN) {
return rectangle2D.containsTriangle(aX, aY, bX, bY, cX, cY);
}
return rectangle2D.intersectsTriangle(aX, aY, bX, bY, cX, cY);
Expand Down
10 changes: 5 additions & 5 deletions lucene/sandbox/src/java/org/apache/lucene/document/LatLonShapeLineQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@

import java.util.Arrays;

import org.apache.lucene.document.LatLonShape.QueryRelation;
import org.apache.lucene.document.ShapeField.QueryRelation;
import org.apache.lucene.geo.GeoEncodingUtils;
import org.apache.lucene.geo.Line;
import org.apache.lucene.geo.Line2D;
import org.apache.lucene.index.PointValues.Relation;
import org.apache.lucene.util.NumericUtils;

/**
* Finds all previously indexed shapes that intersect the specified arbitrary {@code Line}.
* Finds all previously indexed geo shapes that intersect the specified arbitrary {@code Line}.
* <p>
* Note:
* <ul>
Expand All @@ -43,7 +43,7 @@
*
* @lucene.experimental
**/
final class LatLonShapeLineQuery extends LatLonShapeQuery {
final class LatLonShapeLineQuery extends ShapeQuery {
final Line[] lines;
final private Line2D line2D;

Expand Down Expand Up @@ -85,7 +85,7 @@ protected Relation relateRangeBBoxToQuery(int minXOffset, int minYOffset, byte[]

@Override
protected boolean queryMatches(byte[] t, int[] scratchTriangle, QueryRelation queryRelation) {
LatLonShape.decodeTriangle(t, scratchTriangle);
ShapeField.decodeTriangle(t, scratchTriangle);

double alat = GeoEncodingUtils.decodeLatitude(scratchTriangle[0]);
double alon = GeoEncodingUtils.decodeLongitude(scratchTriangle[1]);
Expand All @@ -94,7 +94,7 @@ protected boolean queryMatches(byte[] t, int[] scratchTriangle, QueryRelation qu
double clat = GeoEncodingUtils.decodeLatitude(scratchTriangle[4]);
double clon = GeoEncodingUtils.decodeLongitude(scratchTriangle[5]);

if (queryRelation == LatLonShape.QueryRelation.WITHIN) {
if (queryRelation == QueryRelation.WITHIN) {
return line2D.relateTriangle(alon, alat, blon, blat, clon, clat) == Relation.CELL_INSIDE_QUERY;
}
// INTERSECTS
Expand Down
13 changes: 9 additions & 4 deletions lucene/sandbox/src/java/org/apache/lucene/document/LatLonShapePolygonQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,27 @@

import java.util.Arrays;

import org.apache.lucene.document.LatLonShape.QueryRelation;
import org.apache.lucene.document.ShapeField.QueryRelation;
import org.apache.lucene.geo.GeoEncodingUtils;
import org.apache.lucene.geo.Polygon;
import org.apache.lucene.geo.Polygon2D;
import org.apache.lucene.index.PointValues.Relation;
import org.apache.lucene.util.NumericUtils;

/**
* Finds all previously indexed shapes that intersect the specified arbitrary.
* Finds all previously indexed geo shapes that intersect the specified arbitrary.
* <p>
* Note:
* <ul>
* <li>Dateline crossing is not yet supported. Polygons should be cut at the dateline and provided as a multipolygon query</li>
* </ul>
*
* <p>The field must be indexed using
* {@link org.apache.lucene.document.LatLonShape#createIndexableFields} added per document.
*
* @lucene.experimental
**/
final class LatLonShapePolygonQuery extends LatLonShapeQuery {
final class LatLonShapePolygonQuery extends ShapeQuery {
final Polygon[] polygons;
final private Polygon2D poly2D;

Expand Down Expand Up @@ -74,7 +79,7 @@ protected Relation relateRangeBBoxToQuery(int minXOffset, int minYOffset, byte[]

@Override
protected boolean queryMatches(byte[] t, int[] scratchTriangle, QueryRelation queryRelation) {
LatLonShape.decodeTriangle(t, scratchTriangle);
ShapeField.decodeTriangle(t, scratchTriangle);

double alat = GeoEncodingUtils.decodeLatitude(scratchTriangle[0]);
double alon = GeoEncodingUtils.decodeLongitude(scratchTriangle[1]);
Expand Down
Loading