svn commit: r1580756 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/spatial/ lucene/spatial/src/test/org/apache/lucene/spatial/prefix/SpatialOpRecursivePrefixTreeTest.java

[ds...@apache.org]

Author: dsmiley
Date: Mon Mar 24 05:39:58 2014
New Revision: 1580756

URL: http://svn.apache.org/r1580756
Log:
Fix test failure when not geo and query is point that falls on shared grid border and predicate is Within.

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/spatial/   (props changed)
    lucene/dev/branches/branch_4x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/SpatialOpRecursivePrefixTreeTest.java

Modified: lucene/dev/branches/branch_4x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/SpatialOpRecursivePrefixTreeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/SpatialOpRecursivePrefixTreeTest.java?rev=1580756&r1=1580755&r2=1580756&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/SpatialOpRecursivePrefixTreeTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/SpatialOpRecursivePrefixTreeTest.java Mon Mar 24 05:39:58 2014
@@ -63,7 +63,7 @@ import static com.spatial4j.core.shape.S
 
 public class SpatialOpRecursivePrefixTreeTest extends StrategyTestCase {
 
-  static final int ITERATIONS = 10;//Test Iterations
+  static final int ITERATIONS = 1;//Test Iterations
 
   private SpatialPrefixTree grid;
 
@@ -371,12 +371,8 @@ public class SpatialOpRecursivePrefixTre
       ShapePair me = (ShapePair) snapMe;
       return new ShapePair(gridSnap(me.shape1), gridSnap(me.shape2), me.biasContainsThenWithin);
     }
-    if (ctx.isGeo()) {
-      //A hack; works around issue with (dateline) wrap-around when the point or rect is exactly
-      // adjacent to the dateline.
-      if (snapMe instanceof Point) {
-        snapMe = snapMe.getBoundingBox();
-      }
+    if (snapMe instanceof Point) {
+      snapMe = snapMe.getBoundingBox();
     }
     //The next 4 lines mimic PrefixTreeStrategy.createIndexableFields()
     double distErrPct = ((PrefixTreeStrategy) strategy).getDistErrPct();