You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/10/18 12:49:41 UTC
svn commit: r1709257 - in /lucene/dev/branches/lucene6780/lucene/sandbox/src:
java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java
test/org/apache/lucene/util/BaseGeoPointTestCase.java
Author: mikemccand
Date: Sun Oct 18 10:49:41 2015
New Revision: 1709257
URL: http://svn.apache.org/viewvc?rev=1709257&view=rev
Log:
LUCENE-6780: fix bug in midLat/midLon; don't test dateline crossing when small == true
Modified:
lucene/dev/branches/lucene6780/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java
lucene/dev/branches/lucene6780/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java
Modified: lucene/dev/branches/lucene6780/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6780/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java?rev=1709257&r1=1709256&r2=1709257&view=diff
==============================================================================
--- lucene/dev/branches/lucene6780/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java (original)
+++ lucene/dev/branches/lucene6780/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java Sun Oct 18 10:49:41 2015
@@ -66,8 +66,8 @@ class GeoPointInBBoxQueryImpl extends Ge
final short shiftFactor;
// compute diagonal radius
- double midLon = (maxLon - minLon) * 0.5;
- double midLat = (maxLat - minLat) * 0.5;
+ double midLon = (minLon + maxLon) * 0.5;
+ double midLat = (minLat + maxLat) * 0.5;
if (SloppyMath.haversin(minLat, minLon, midLat, midLon)*1000 > 1000000) {
shiftFactor = 5;
Modified: lucene/dev/branches/lucene6780/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6780/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java?rev=1709257&r1=1709256&r2=1709257&view=diff
==============================================================================
--- lucene/dev/branches/lucene6780/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java (original)
+++ lucene/dev/branches/lucene6780/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java Sun Oct 18 10:49:41 2015
@@ -232,7 +232,8 @@ public abstract class BaseGeoPointTestCa
int iters = atLeast(100);
for (int iter=0;iter<iters;iter++) {
- GeoRect rect = randomRect(small, true);
+ // Don't allow dateline crossing when testing small:
+ GeoRect rect = randomRect(small, small == false);
if (VERBOSE) {
System.out.println("\nTEST: iter=" + iter + " bbox=" + rect);
@@ -598,8 +599,8 @@ public abstract class BaseGeoPointTestCa
VerifyHits verifyHits;
if (random().nextBoolean()) {
- // BBox
- final GeoRect bbox = randomRect(small, true);
+ // BBox: don't allow dateline crossing when testing small:
+ final GeoRect bbox = randomRect(small, small == false);
query = newBBoxQuery(FIELD_NAME, bbox);