From 69da13ff6f9fc6cbe77f587b880fad6834075f34 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Mon, 21 Mar 2016 22:47:31 -0400 Subject: [PATCH] LUCENE-7125: remove additional confusion (we already quantize once, don't do it again). --- .../lucene/search/TestLatLonPointQueries.java | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonPointQueries.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonPointQueries.java index 3b48eee9234..5831095738d 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonPointQueries.java +++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonPointQueries.java @@ -53,28 +53,14 @@ public class TestLatLonPointQueries extends BaseGeoPointTestCase { @Override protected Boolean rectContainsPoint(GeoRect rect, double pointLat, double pointLon) { - assert Double.isNaN(pointLat) == false; - int rectLatMinEnc = LatLonPoint.encodeLatitude(rect.minLat); - int rectLatMaxEnc = LatLonPoint.encodeLatitude(rect.maxLat); - int rectLonMinEnc = LatLonPoint.encodeLongitude(rect.minLon); - int rectLonMaxEnc = LatLonPoint.encodeLongitude(rect.maxLon); - - int pointLatEnc = LatLonPoint.encodeLatitude(pointLat); - int pointLonEnc = LatLonPoint.encodeLongitude(pointLon); - if (rect.minLon < rect.maxLon) { - return pointLatEnc >= rectLatMinEnc && - pointLatEnc <= rectLatMaxEnc && - pointLonEnc >= rectLonMinEnc && - pointLonEnc <= rectLonMaxEnc; + return GeoRelationUtils.pointInRectPrecise(pointLon, pointLat, rect.minLon, rect.minLat, rect.maxLon, rect.maxLat); } else { // Rect crosses dateline: - return pointLatEnc >= rectLatMinEnc && - pointLatEnc <= rectLatMaxEnc && - (pointLonEnc >= rectLonMinEnc || - pointLonEnc <= rectLonMaxEnc); + return GeoRelationUtils.pointInRectPrecise(pointLon, pointLat, -180.0, rect.minLat, rect.maxLon, rect.maxLat) + || GeoRelationUtils.pointInRectPrecise(pointLon, pointLat, rect.minLon, rect.minLat, 180.0, rect.maxLat); } }