You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2012/03/02 06:26:01 UTC
svn commit: r1296054 - in
/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src:
java/org/apache/lucene/spatial/ java/org/apache/lucene/spatial/prefix/
java/org/apache/lucene/spatial/prefix/tree/
java/org/apache/lucene/spatial/strategy...
Author: dsmiley
Date: Fri Mar 2 05:26:00 2012
New Revision: 1296054
URL: http://svn.apache.org/viewvc?rev=1296054&view=rev
Log:
Refactored away the ".strategy" sub-package name. No need since spatial4j exists.
Added:
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SimpleSpatialFieldInfo.java
- copied, changed from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialFieldInfo.java
- copied, changed from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java
- copied, changed from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/package-info.java
- copied, changed from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/package-info.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/
- copied from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/
- copied from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/
- copied from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/
- copied from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/
- copied from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/BaseTwoDoublesStrategyTestCase.java
- copied, changed from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/TwoDoublesStrategyTestCase.java
- copied, changed from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java
Removed:
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/DistanceValueSource.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/TwoDoublesFieldInfo.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
Modified:
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixCellsTokenizer.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Node.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachedDistanceValueSource.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/NumericFieldInfo.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/StringListTokenizer.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/TruncateFilter.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesFieldInfo.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategyTestCase.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestSpatialPrefixField.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java
Copied: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SimpleSpatialFieldInfo.java (from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SimpleSpatialFieldInfo.java?p2=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SimpleSpatialFieldInfo.java&p1=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java&r1=1296051&r2=1296054&rev=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SimpleSpatialFieldInfo.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy;
+package org.apache.lucene.spatial;
public class SimpleSpatialFieldInfo implements SpatialFieldInfo {
Copied: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialFieldInfo.java (from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialFieldInfo.java?p2=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialFieldInfo.java&p1=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java&r1=1296051&r2=1296054&rev=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialFieldInfo.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy;
+package org.apache.lucene.spatial;
/**
* Information the strategy needs for the lucene fields
Copied: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java (from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java?p2=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java&p1=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java&r1=1296051&r2=1296054&rev=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java Fri Mar 2 05:26:00 2012
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy;
+package org.apache.lucene.spatial;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.query.SpatialArgs;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
-import com.spatial4j.core.context.SpatialContext;
-import com.spatial4j.core.query.SpatialArgs;
-import com.spatial4j.core.shape.Shape;
/**
* must be thread safe
Copied: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/package-info.java (from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/package-info.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/package-info.java?p2=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/package-info.java&p1=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/package-info.java&r1=1296051&r2=1296054&rev=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/strategy/package-info.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/package-info.java Fri Mar 2 05:26:00 2012
@@ -22,5 +22,5 @@
* Check:
* http://blog.notdot.net/2009/11/Damn-Cool-Algorithms-Spatial-indexing-with-Quadtrees-and-Hilbert-Curves
*/
-package org.apache.lucene.spatial.strategy;
+package org.apache.lucene.spatial;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java Fri Mar 2 05:26:00 2012
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
import com.spatial4j.core.shape.Point;
-
-import org.apache.lucene.spatial.strategy.prefix.tree.Node;
-import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree;
-import org.apache.lucene.spatial.strategy.util.ShapeFieldCacheProvider;
+import org.apache.lucene.spatial.prefix.tree.Node;
+import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
+import org.apache.lucene.spatial.util.ShapeFieldCacheProvider;
import org.apache.lucene.util.BytesRef;
public class PointPrefixTreeFieldCacheProvider extends ShapeFieldCacheProvider<Point> {
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixCellsTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixCellsTokenizer.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixCellsTokenizer.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixCellsTokenizer.java Fri Mar 2 05:26:00 2012
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
-
-import java.io.IOException;
-import java.io.Reader;
+package org.apache.lucene.spatial.prefix;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import java.io.IOException;
+import java.io.Reader;
+
/**
*
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java Fri Mar 2 05:26:00 2012
@@ -15,8 +15,12 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
+import com.spatial4j.core.distance.DistanceCalculator;
+import com.spatial4j.core.query.SpatialArgs;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Field;
@@ -24,15 +28,11 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.queries.function.ValueSource;
-import com.spatial4j.core.distance.DistanceCalculator;
-import com.spatial4j.core.query.SpatialArgs;
-import com.spatial4j.core.shape.Point;
-import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
-import org.apache.lucene.spatial.strategy.SpatialStrategy;
-import org.apache.lucene.spatial.strategy.prefix.tree.Node;
-import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree;
-import org.apache.lucene.spatial.strategy.util.CachedDistanceValueSource;
+import org.apache.lucene.spatial.SimpleSpatialFieldInfo;
+import org.apache.lucene.spatial.SpatialStrategy;
+import org.apache.lucene.spatial.prefix.tree.Node;
+import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
+import org.apache.lucene.spatial.util.CachedDistanceValueSource;
import java.io.IOException;
import java.util.Iterator;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java Fri Mar 2 05:26:00 2012
@@ -15,17 +15,16 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
+import com.spatial4j.core.shape.Shape;
+import com.spatial4j.core.shape.SpatialRelation;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter;
-import org.apache.lucene.spatial.strategy.prefix.tree.Node;
-import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree;
-
-import com.spatial4j.core.shape.SpatialRelation;
-import com.spatial4j.core.shape.Shape;
+import org.apache.lucene.spatial.prefix.tree.Node;
+import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.OpenBitSet;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java Fri Mar 2 05:26:00 2012
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.FilteredQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.queries.function.FunctionQuery;
import com.spatial4j.core.exception.UnsupportedSpatialOperation;
import com.spatial4j.core.query.SpatialArgs;
import com.spatial4j.core.query.SpatialOperation;
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
-import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree;
+import org.apache.lucene.queries.function.FunctionQuery;
+import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.FilteredQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.spatial.SimpleSpatialFieldInfo;
+import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
public class RecursivePrefixTreeStrategy extends PrefixTreeStrategy {
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java Fri Mar 2 05:26:00 2012
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.*;
import com.spatial4j.core.exception.UnsupportedSpatialOperation;
import com.spatial4j.core.query.SpatialArgs;
import com.spatial4j.core.query.SpatialOperation;
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
-import org.apache.lucene.spatial.strategy.prefix.tree.Node;
-import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.*;
+import org.apache.lucene.spatial.SimpleSpatialFieldInfo;
+import org.apache.lucene.spatial.prefix.tree.Node;
+import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
import java.util.List;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java Fri Mar 2 05:26:00 2012
@@ -18,5 +18,5 @@
/**
* Prefix Tree Strategy
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix.tree;
+package org.apache.lucene.spatial.prefix.tree;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.shape.Point;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Node.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Node.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Node.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Node.java Fri Mar 2 05:26:00 2012
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix.tree;
+package org.apache.lucene.spatial.prefix.tree;
-import com.spatial4j.core.shape.SpatialRelation;
import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Shape;
+import com.spatial4j.core.shape.SpatialRelation;
import java.util.ArrayList;
import java.util.Collection;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java Fri Mar 2 05:26:00 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix.tree;
+package org.apache.lucene.spatial.prefix.tree;
-import com.spatial4j.core.shape.SpatialRelation;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
+import com.spatial4j.core.shape.SpatialRelation;
import com.spatial4j.core.shape.simple.PointImpl;
import java.text.NumberFormat;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix.tree;
+package org.apache.lucene.spatial.prefix.tree;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.shape.Point;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix.tree;
+package org.apache.lucene.spatial.prefix.tree;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.distance.DistanceUnits;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java Fri Mar 2 05:26:00 2012
@@ -24,5 +24,5 @@
* * http://en.wikipedia.org/wiki/Geohash
* * http://healpix.jpl.nasa.gov/
*/
-package org.apache.lucene.spatial.strategy.prefix.tree;
+package org.apache.lucene.spatial.prefix.tree;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachedDistanceValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachedDistanceValueSource.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachedDistanceValueSource.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachedDistanceValueSource.java Fri Mar 2 05:26:00 2012
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.util;
+package org.apache.lucene.spatial.util;
+import com.spatial4j.core.distance.DistanceCalculator;
+import com.spatial4j.core.shape.Point;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
-import com.spatial4j.core.distance.DistanceCalculator;
-import com.spatial4j.core.shape.Point;
import java.io.IOException;
import java.util.List;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.util;
+package org.apache.lucene.spatial.util;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.lucene.index.AtomicReaderContext;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/NumericFieldInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/NumericFieldInfo.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/NumericFieldInfo.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/NumericFieldInfo.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.util;
+package org.apache.lucene.spatial.util;
import org.apache.lucene.document.DoubleField;
import org.apache.lucene.document.FieldType;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java Fri Mar 2 05:26:00 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.util;
+package org.apache.lucene.spatial.util;
+
+import com.spatial4j.core.shape.Shape;
import java.util.ArrayList;
import java.util.List;
-import com.spatial4j.core.shape.Shape;
-
public class ShapeFieldCache<T extends Shape> {
private List<T>[] cache;
public int defaultLength;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java Fri Mar 2 05:26:00 2012
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.util;
+package org.apache.lucene.spatial.util;
+import com.spatial4j.core.shape.Shape;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
-import com.spatial4j.core.shape.Shape;
import org.apache.lucene.util.BytesRef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/StringListTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/StringListTokenizer.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/StringListTokenizer.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/StringListTokenizer.java Fri Mar 2 05:26:00 2012
@@ -15,16 +15,14 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.util;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Iterator;
+package org.apache.lucene.spatial.util;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import java.io.IOException;
+import java.util.Iterator;
+
/**
* Put a list of strings directly into the token stream
*/
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/TruncateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/TruncateFilter.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/TruncateFilter.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/TruncateFilter.java Fri Mar 2 05:26:00 2012
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.util;
+package org.apache.lucene.spatial.util;
-import java.io.IOException;
-
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import java.io.IOException;
+
public class TruncateFilter extends TokenFilter {
private final int maxTokenLength;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.util;
+package org.apache.lucene.spatial.util;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java Fri Mar 2 05:26:00 2012
@@ -15,8 +15,11 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.vector;
+package org.apache.lucene.spatial.vector;
+import com.spatial4j.core.distance.DistanceCalculator;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.simple.PointImpl;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.lucene.index.AtomicReader;
@@ -25,9 +28,6 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldCache.DoubleParser;
-import com.spatial4j.core.distance.DistanceCalculator;
-import com.spatial4j.core.shape.Point;
-import com.spatial4j.core.shape.simple.PointImpl;
import org.apache.lucene.util.Bits;
import java.io.IOException;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesFieldInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesFieldInfo.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesFieldInfo.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesFieldInfo.java Fri Mar 2 05:26:00 2012
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.vector;
+package org.apache.lucene.spatial.vector;
-import org.apache.lucene.spatial.strategy.SpatialFieldInfo;
+import org.apache.lucene.spatial.SpatialFieldInfo;
public class TwoDoublesFieldInfo implements SpatialFieldInfo {
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java Fri Mar 2 05:26:00 2012
@@ -15,15 +15,8 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.vector;
+package org.apache.lucene.spatial.vector;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.queries.function.FunctionQuery;
-import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.search.*;
-import org.apache.lucene.search.FieldCache.DoubleParser;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.exception.InvalidShapeException;
import com.spatial4j.core.exception.UnsupportedSpatialOperation;
@@ -33,10 +26,17 @@ import com.spatial4j.core.shape.Circle;
import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.spatial.strategy.SpatialStrategy;
-import org.apache.lucene.spatial.strategy.util.CachingDoubleValueSource;
-import org.apache.lucene.spatial.strategy.util.NumericFieldInfo;
-import org.apache.lucene.spatial.strategy.util.ValueSourceFilter;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.queries.function.FunctionQuery;
+import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.search.*;
+import org.apache.lucene.search.FieldCache.DoubleParser;
+import org.apache.lucene.spatial.SpatialStrategy;
+import org.apache.lucene.spatial.util.CachingDoubleValueSource;
+import org.apache.lucene.spatial.util.NumericFieldInfo;
+import org.apache.lucene.spatial.util.ValueSourceFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java?rev=1296054&r1=1296053&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java Fri Mar 2 05:26:00 2012
@@ -18,18 +18,16 @@
package org.apache.lucene.spatial;
-import junit.framework.Assert;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.IndexableField;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.io.sample.SampleData;
import com.spatial4j.core.io.sample.SampleDataReader;
import com.spatial4j.core.query.SpatialArgsParser;
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.spatial.strategy.SpatialFieldInfo;
-import org.apache.lucene.spatial.strategy.SpatialStrategy;
+import junit.framework.Assert;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.index.IndexableField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/BaseRecursivePrefixTreeStrategyTestCase.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/BaseRecursivePrefixTreeStrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/BaseRecursivePrefixTreeStrategyTestCase.java Fri Mar 2 05:26:00 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
import com.spatial4j.core.context.SpatialContext;
-import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
-import org.apache.lucene.spatial.strategy.prefix.tree.GeohashPrefixTree;
+import org.apache.lucene.spatial.SimpleSpatialFieldInfo;
import org.apache.lucene.spatial.SpatialMatchConcern;
import org.apache.lucene.spatial.StrategyTestCase;
+import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree;
import org.junit.Test;
import java.io.IOException;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategyTestCase.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategyTestCase.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.context.simple.SimpleSpatialContext;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestSpatialPrefixField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestSpatialPrefixField.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestSpatialPrefixField.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestSpatialPrefixField.java Fri Mar 2 05:26:00 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
+
+import org.junit.Test;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
-
/**
* This is just a quick idea for *simple* tests
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java Fri Mar 2 05:26:00 2012
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix;
+package org.apache.lucene.spatial.prefix;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.context.simple.SimpleSpatialContext;
import com.spatial4j.core.query.SpatialArgsParser;
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.simple.PointImpl;
-import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo;
-import org.apache.lucene.spatial.strategy.prefix.tree.QuadPrefixTree;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.spatial.SimpleSpatialFieldInfo;
import org.apache.lucene.spatial.SpatialTestCase;
+import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree;
import org.junit.Test;
import java.io.IOException;
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java?rev=1296054&r1=1296051&r2=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java Fri Mar 2 05:26:00 2012
@@ -15,15 +15,11 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.prefix.tree;
+package org.apache.lucene.spatial.prefix.tree;
import com.spatial4j.core.context.simple.SimpleSpatialContext;
import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
-
-import org.apache.lucene.spatial.strategy.prefix.tree.GeohashPrefixTree;
-import org.apache.lucene.spatial.strategy.prefix.tree.Node;
-import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree;
import org.junit.Before;
import org.junit.Test;
Copied: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/BaseTwoDoublesStrategyTestCase.java (from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/BaseTwoDoublesStrategyTestCase.java?p2=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/BaseTwoDoublesStrategyTestCase.java&p1=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java&r1=1296051&r2=1296054&rev=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/BaseTwoDoublesStrategyTestCase.java Fri Mar 2 05:26:00 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.vector;
+package org.apache.lucene.spatial.vector;
-import org.apache.lucene.search.FieldCache;
import com.spatial4j.core.context.SpatialContext;
-import org.apache.lucene.spatial.strategy.util.NumericFieldInfo;
+import org.apache.lucene.search.FieldCache;
import org.apache.lucene.spatial.SpatialMatchConcern;
import org.apache.lucene.spatial.StrategyTestCase;
+import org.apache.lucene.spatial.util.NumericFieldInfo;
import org.junit.Test;
import java.io.IOException;
Copied: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/TwoDoublesStrategyTestCase.java (from r1296051, lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/TwoDoublesStrategyTestCase.java?p2=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/TwoDoublesStrategyTestCase.java&p1=lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java&r1=1296051&r2=1296054&rev=1296054&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/src/test/org/apache/lucene/spatial/vector/TwoDoublesStrategyTestCase.java Fri Mar 2 05:26:00 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.spatial.strategy.vector;
+package org.apache.lucene.spatial.vector;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.context.simple.SimpleSpatialContext;