LUCENE-7229: Improve Polygon.relate for faster tree traversal/grid construction

This commit is contained in:
Robert Muir 2016-04-18 20:21:42 -04:00
parent b839325740
commit af09c618eb
3 changed files with 70 additions and 64 deletions

View File

@ -61,7 +61,7 @@ Optimizations
multiple polygons and holes, with memory usage independent of multiple polygons and holes, with memory usage independent of
polygon complexity. (Karl Wright, Mike McCandless, Robert Muir) polygon complexity. (Karl Wright, Mike McCandless, Robert Muir)
* LUCENE-7159, LUCENE-7222: Speed up LatLonPoint polygon performance for complex * LUCENE-7159, LUCENE-7222, LUCENE-7229: Speed up LatLonPoint polygon performance for complex
polygons. (Robert Muir) polygons. (Robert Muir)
* LUCENE-7211: Reduce memory & GC for spatial RPT Intersects when the number of * LUCENE-7211: Reduce memory & GC for spatial RPT Intersects when the number of

View File

@ -48,9 +48,6 @@ public final class Polygon {
/** maximum longitude of this polygon's bounding box area */ /** maximum longitude of this polygon's bounding box area */
public final double maxLon; public final double maxLon;
// TODO: refactor to GeoUtils once LUCENE-7165 is complete
private static final double ENCODING_TOLERANCE = 1e-6;
// TODO: we could also compute the maximal inner bounding box, to make relations faster to compute? // TODO: we could also compute the maximal inner bounding box, to make relations faster to compute?
/** /**
@ -234,70 +231,79 @@ public final class Polygon {
return containsCount; return containsCount;
} }
private boolean crossesSlowly(double minLat, double maxLat, final double minLon, final double maxLon) { /** Returns true if the box crosses our polygon */
/* private boolean crossesSlowly(double minLat, double maxLat, double minLon, double maxLon) {
* Accurately compute (within restrictions of cartesian decimal degrees) whether a rectangle crosses a polygon // we compute line intersections of every polygon edge with every box line.
*/ // if we find one, return true.
final double[] boxLats = new double[] { minLat, minLat, maxLat, maxLat, minLat }; // for each box line (AB):
final double[] boxLons = new double[] { minLon, maxLon, maxLon, minLon, minLon }; // for each poly line (CD):
// intersects = orient(C,D,A) * orient(C,D,B) <= 0 && orient(A,B,C) * orient(A,B,D) <= 0
for (int i = 1; i < polyLons.length; i++) {
double cy = polyLats[i - 1];
double dy = polyLats[i];
double cx = polyLons[i - 1];
double dx = polyLons[i];
// computes the intersection point between each bbox edge and the polygon edge // optimization: see if the rectangle is outside of the "bounding box" of the polyline at all
for (int b=0; b<4; ++b) { // if not, don't waste our time trying more complicated stuff
double a1 = boxLats[b+1]-boxLats[b]; if ((cy < minLat && dy < minLat) ||
double b1 = boxLons[b]-boxLons[b+1]; (cy > maxLat && dy > maxLat) ||
double c1 = a1*boxLons[b+1] + b1*boxLats[b+1]; (cx < minLon && dx < minLon) ||
for (int p=0; p<polyLons.length-1; ++p) { (cx > maxLon && dx > maxLon)) {
double a2 = polyLats[p+1]-polyLats[p]; continue;
double b2 = polyLons[p]-polyLons[p+1]; }
// compute determinant
double d = a1*b2 - a2*b1;
if (d != 0) {
// lines are not parallel, check intersecting points
double c2 = a2*polyLons[p+1] + b2*polyLats[p+1];
double s = (1/d)*(b2*c1 - b1*c2);
// todo TOLERANCE SHOULD MATCH EVERYWHERE this is currently blocked by LUCENE-7165
double x00 = Math.min(boxLons[b], boxLons[b+1]) - ENCODING_TOLERANCE;
if (x00 > s) {
continue; // out of range
}
double x01 = Math.max(boxLons[b], boxLons[b+1]) + ENCODING_TOLERANCE;
if (x01 < s) {
continue; // out of range
}
double x10 = Math.min(polyLons[p], polyLons[p+1]) - ENCODING_TOLERANCE;
if (x10 > s) {
continue; // out of range
}
double x11 = Math.max(polyLons[p], polyLons[p+1]) + ENCODING_TOLERANCE;
if (x11 < s) {
continue; // out of range
}
double t = (1/d)*(a1*c2 - a2*c1); // does box's top edge intersect polyline?
double y00 = Math.min(boxLats[b], boxLats[b+1]) - ENCODING_TOLERANCE; // ax = minLon, bx = maxLon, ay = maxLat, by = maxLat
if (y00 > t || (x00 == s && y00 == t)) { if (orient(cx, cy, dx, dy, minLon, maxLat) * orient(cx, cy, dx, dy, maxLon, maxLat) <= 0 &&
continue; // out of range or touching orient(minLon, maxLat, maxLon, maxLat, cx, cy) * orient(minLon, maxLat, maxLon, maxLat, dx, dy) <= 0) {
} return true;
double y01 = Math.max(boxLats[b], boxLats[b+1]) + ENCODING_TOLERANCE; }
if (y01 < t || (x01 == s && y01 == t)) {
continue; // out of range or touching // does box's right edge intersect polyline?
} // ax = maxLon, bx = maxLon, ay = maxLat, by = minLat
double y10 = Math.min(polyLats[p], polyLats[p+1]) - ENCODING_TOLERANCE; if (orient(cx, cy, dx, dy, maxLon, maxLat) * orient(cx, cy, dx, dy, maxLon, minLat) <= 0 &&
if (y10 > t || (x10 == s && y10 == t)) { orient(maxLon, maxLat, maxLon, minLat, cx, cy) * orient(maxLon, maxLat, maxLon, minLat, dx, dy) <= 0) {
continue; // out of range or touching return true;
} }
double y11 = Math.max(polyLats[p], polyLats[p+1]) + ENCODING_TOLERANCE;
if (y11 < t || (x11 == s && y11 == t)) { // does box's bottom edge intersect polyline?
continue; // out of range or touching // ax = maxLon, bx = minLon, ay = minLat, by = minLat
} if (orient(cx, cy, dx, dy, maxLon, minLat) * orient(cx, cy, dx, dy, minLon, minLat) <= 0 &&
// if line segments are not touching and the intersection point is within the range of either segment orient(maxLon, minLat, minLon, minLat, cx, cy) * orient(maxLon, minLat, minLon, minLat, dx, dy) <= 0) {
return true; return true;
} }
} // for each poly edge
} // for each bbox edge // does box's left edge intersect polyline?
// ax = minLon, bx = minLon, ay = minLat, by = maxLat
if (orient(cx, cy, dx, dy, minLon, minLat) * orient(cx, cy, dx, dy, minLon, maxLat) <= 0 &&
orient(minLon, minLat, minLon, maxLat, cx, cy) * orient(minLon, minLat, minLon, maxLat, dx, dy) <= 0) {
return true;
}
}
return false; return false;
} }
/**
* Returns a positive value if points a, b, and c are arranged in counter-clockwise order,
* negative value if clockwise, zero if collinear.
*/
// see the "Orient2D" method described here:
// http://www.cs.berkeley.edu/~jrs/meshpapers/robnotes.pdf
// https://www.cs.cmu.edu/~quake/robust.html
// Note that this one does not yet have the floating point tricks to be exact!
private static int orient(double ax, double ay, double bx, double by, double cx, double cy) {
double v1 = (bx - ax) * (cy - ay);
double v2 = (cx - ax) * (by - ay);
if (v1 > v2) {
return 1;
} else if (v1 < v2) {
return -1;
} else {
return 0;
}
}
/** Returns a copy of the internal latitude array */ /** Returns a copy of the internal latitude array */
public double[] getPolyLats() { public double[] getPolyLats() {
return polyLats.clone(); return polyLats.clone();

View File

@ -48,7 +48,7 @@ import static org.apache.lucene.geo.GeoEncodingUtils.decodeLongitude;
// relational operations as rectangle <-> rectangle relations in integer space in log(n) time.. // relational operations as rectangle <-> rectangle relations in integer space in log(n) time..
final class LatLonGrid { final class LatLonGrid {
// must be a power of two! // must be a power of two!
static final int GRID_SIZE = 1<<5; static final int GRID_SIZE = 1<<7;
final int minLat; final int minLat;
final int maxLat; final int maxLat;
final int minLon; final int minLon;