Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slightly improve polygon testing: test something other than boxes

This commit is contained in:
Robert Muir 2016-03-27 15:27:17 -04:00
parent 7b93fc46b1
commit 6ac0c43b97
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lucene/spatial/src/test/org/apache/lucene/spatial/util/BaseGeoPointTestCase.java
View File

@ -695,18 +695,7 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase {
} }
} }
static final boolean polyRectContainsPoint(GeoRect rect, double pointLat, double pointLon) { static final boolean polygonContainsPoint(double polyLats[], double polyLons[], double pointLat, double pointLon) {
// TODO write better random polygon tests
// note: logic must be slightly different than rectContainsPoint, to satisfy
// insideness for cases exactly on boundaries.
assert Double.isNaN(pointLat) == false;
assert rect.crossesDateline() == false;
double polyLats[] = new double[] { rect.minLat, rect.maxLat, rect.maxLat, rect.minLat, rect.minLat };
double polyLons[] = new double[] { rect.minLon, rect.minLon, rect.maxLon, rect.maxLon, rect.minLon };
// TODO: separately test this method is 100% correct, here treat it like a black box (like haversin)
return GeoRelationUtils.pointInPolygon(polyLats, polyLons, pointLat, pointLon); return GeoRelationUtils.pointInPolygon(polyLats, polyLons, pointLat, pointLon);
} }
@ -940,8 +929,13 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase {
final GeoRect bbox = randomRect(small, false); final GeoRect bbox = randomRect(small, false);
// Polygon // Polygon
double[] polyLats = new double[5]; final double[] polyLats;
double[] polyLons = new double[5]; final double[] polyLons;
// TODO: factor this out, maybe if we add Polygon class?
if (random().nextBoolean()) {
// box
polyLats = new double[5];
polyLons = new double[5];
polyLats[0] = bbox.minLat; polyLats[0] = bbox.minLat;
polyLons[0] = bbox.minLon; polyLons[0] = bbox.minLon;
polyLats[1] = bbox.maxLat; polyLats[1] = bbox.maxLat;
@ -952,12 +946,25 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase {
polyLons[3] = bbox.maxLon; polyLons[3] = bbox.maxLon;
polyLats[4] = bbox.minLat; polyLats[4] = bbox.minLat;
polyLons[4] = bbox.minLon; polyLons[4] = bbox.minLon;
} else {
// right triangle
polyLats = new double[4];
polyLons = new double[4];
polyLats[0] = bbox.minLat;
polyLons[0] = bbox.minLon;
polyLats[1] = bbox.maxLat;
polyLons[1] = bbox.minLon;
polyLats[2] = bbox.maxLat;
polyLons[2] = bbox.maxLon;
polyLats[3] = bbox.minLat;
polyLons[3] = bbox.minLon;
}
query = newPolygonQuery(FIELD_NAME, polyLats, polyLons); query = newPolygonQuery(FIELD_NAME, polyLats, polyLons);
verifyHits = new VerifyHits() { verifyHits = new VerifyHits() {
@Override @Override
protected boolean shouldMatch(double pointLat, double pointLon) { protected boolean shouldMatch(double pointLat, double pointLon) {
return polyRectContainsPoint(bbox, pointLat, pointLon); return polygonContainsPoint(polyLats, polyLons, pointLat, pointLon);
} }
@Override @Override