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

Refactored away the ".strategy" sub-package name. No need since spatial4j exists. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1296054 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Wayne Smiley 2012-03-02 05:26:00 +00:00
parent fdb0bd695e
commit c2c2b23e9d
36 changed files with 112 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java → modules/spatial/src/java/org/apache/lucene/spatial/SimpleSpatialFieldInfo.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.lucene.spatial.strategy; package org.apache.lucene.spatial;
public class SimpleSpatialFieldInfo implements SpatialFieldInfo { public class SimpleSpatialFieldInfo implements SpatialFieldInfo {

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java → modules/spatial/src/java/org/apache/lucene/spatial/SpatialFieldInfo.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.lucene.spatial.strategy; package org.apache.lucene.spatial;
/** /**
* Information the strategy needs for the lucene fields * Information the strategy needs for the lucene fields

8
modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java → modules/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java
View File

@ -15,15 +15,15 @@
* limitations under the License. * 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.index.IndexableField;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query; 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 * must be thread safe

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/package-info.java → modules/spatial/src/java/org/apache/lucene/spatial/package-info.java
View File

@ -22,5 +22,5 @@
* Check: * Check:
* http://blog.notdot.net/2009/11/Damn-Cool-Algorithms-Spatial-indexing-with-Quadtrees-and-Hilbert-Curves * 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;

9
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java
View File

@ -15,13 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.lucene.spatial.strategy.prefix; package org.apache.lucene.spatial.prefix;
import com.spatial4j.core.shape.Point; import com.spatial4j.core.shape.Point;
import org.apache.lucene.spatial.prefix.tree.Node;
import org.apache.lucene.spatial.strategy.prefix.tree.Node; import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree; import org.apache.lucene.spatial.util.ShapeFieldCacheProvider;
import org.apache.lucene.spatial.strategy.util.ShapeFieldCacheProvider;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
public class PointPrefixTreeFieldCacheProvider extends ShapeFieldCacheProvider<Point> { public class PointPrefixTreeFieldCacheProvider extends ShapeFieldCacheProvider<Point> {

8
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixCellsTokenizer.java
View File

@ -15,14 +15,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.lucene.spatial.strategy.prefix; package org.apache.lucene.spatial.prefix;
import java.io.IOException;
import java.io.Reader;
import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import java.io.IOException;
import java.io.Reader;
/** /**
* *

20
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
View File

@ -15,8 +15,12 @@
* limitations under the License. * 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.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
@ -24,15 +28,11 @@ import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.IndexableField;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import com.spatial4j.core.distance.DistanceCalculator; import org.apache.lucene.spatial.SimpleSpatialFieldInfo;
import com.spatial4j.core.query.SpatialArgs; import org.apache.lucene.spatial.SpatialStrategy;
import com.spatial4j.core.shape.Point; import org.apache.lucene.spatial.prefix.tree.Node;
import com.spatial4j.core.shape.Shape; import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo; import org.apache.lucene.spatial.util.CachedDistanceValueSource;
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 java.io.IOException; import java.io.IOException;
import java.util.Iterator; import java.util.Iterator;

11
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java
View File

@ -15,17 +15,16 @@
* limitations under the License. * 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.index.*;
import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.apache.lucene.spatial.strategy.prefix.tree.Node; import org.apache.lucene.spatial.prefix.tree.Node;
import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree; import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
import com.spatial4j.core.shape.SpatialRelation;
import com.spatial4j.core.shape.Shape;
import org.apache.lucene.util.Bits; import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.OpenBitSet; import org.apache.lucene.util.OpenBitSet;

16
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
View File

@ -15,19 +15,19 @@
* limitations under the License. * 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.exception.UnsupportedSpatialOperation;
import com.spatial4j.core.query.SpatialArgs; import com.spatial4j.core.query.SpatialArgs;
import com.spatial4j.core.query.SpatialOperation; import com.spatial4j.core.query.SpatialOperation;
import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.Shape;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo; import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree; 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 { public class RecursivePrefixTreeStrategy extends PrefixTreeStrategy {

12
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java
View File

@ -15,17 +15,17 @@
* limitations under the License. * 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.exception.UnsupportedSpatialOperation;
import com.spatial4j.core.query.SpatialArgs; import com.spatial4j.core.query.SpatialArgs;
import com.spatial4j.core.query.SpatialOperation; import com.spatial4j.core.query.SpatialOperation;
import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.Shape;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo; import org.apache.lucene.index.Term;
import org.apache.lucene.spatial.strategy.prefix.tree.Node; import org.apache.lucene.search.*;
import org.apache.lucene.spatial.strategy.prefix.tree.SpatialPrefixTree; 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; import java.util.List;

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/package-info.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java
View File

@ -18,5 +18,5 @@
/** /**
* Prefix Tree Strategy * Prefix Tree Strategy
*/ */
package org.apache.lucene.spatial.strategy.prefix; package org.apache.lucene.spatial.prefix;

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/tree/GeohashPrefixTree.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * 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.context.SpatialContext;
import com.spatial4j.core.shape.Point; import com.spatial4j.core.shape.Point;

4
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/tree/Node.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Node.java
View File

@ -15,11 +15,11 @@
* limitations under the License. * 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.Point;
import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.SpatialRelation;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

4
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/tree/QuadPrefixTree.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
View File

@ -15,13 +15,13 @@
* limitations under the License. * 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.context.SpatialContext;
import com.spatial4j.core.shape.Point; import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Rectangle; import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.SpatialRelation;
import com.spatial4j.core.shape.simple.PointImpl; import com.spatial4j.core.shape.simple.PointImpl;
import java.text.NumberFormat; import java.text.NumberFormat;

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/tree/SpatialPrefixTree.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * 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.context.SpatialContext;
import com.spatial4j.core.shape.Point; import com.spatial4j.core.shape.Point;

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/tree/SpatialPrefixTreeFactory.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * 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.context.SpatialContext;
import com.spatial4j.core.distance.DistanceUnits; import com.spatial4j.core.distance.DistanceUnits;

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/tree/package-info.java → modules/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java
View File

@ -24,5 +24,5 @@
* * http://en.wikipedia.org/wiki/Geohash * * http://en.wikipedia.org/wiki/Geohash
* * http://healpix.jpl.nasa.gov/ * * http://healpix.jpl.nasa.gov/
*/ */
package org.apache.lucene.spatial.strategy.prefix.tree; package org.apache.lucene.spatial.prefix.tree;

6
modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java → modules/spatial/src/java/org/apache/lucene/spatial/util/CachedDistanceValueSource.java
View File

@ -15,15 +15,15 @@
* limitations under the License. * 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.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource; 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.io.IOException;
import java.util.List; import java.util.List;

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java → modules/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * 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.commons.lang.builder.HashCodeBuilder;
import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.AtomicReaderContext;

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java → modules/spatial/src/java/org/apache/lucene/spatial/util/NumericFieldInfo.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * 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.DoubleField;
import org.apache.lucene.document.FieldType; import org.apache.lucene.document.FieldType;

6
modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java → modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java
View File

@ -15,13 +15,13 @@
* limitations under the License. * 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.ArrayList;
import java.util.List; import java.util.List;
import com.spatial4j.core.shape.Shape;
public class ShapeFieldCache<T extends Shape> { public class ShapeFieldCache<T extends Shape> {
private List<T>[] cache; private List<T>[] cache;
public int defaultLength; public int defaultLength;

4
modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java → modules/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
View File

@ -15,11 +15,11 @@
* limitations under the License. * 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.index.*;
import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.DocIdSetIterator;
import com.spatial4j.core.shape.Shape;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

10
modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java → modules/spatial/src/java/org/apache/lucene/spatial/util/StringListTokenizer.java
View File

@ -15,16 +15,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.lucene.spatial.strategy.util; package org.apache.lucene.spatial.util;
import java.io.IOException;
import java.io.Reader;
import java.util.Iterator;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; 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 * Put a list of strings directly into the token stream
*/ */

6
modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java → modules/spatial/src/java/org/apache/lucene/spatial/util/TruncateFilter.java
View File

@ -15,15 +15,15 @@
* limitations under the License. * 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.TokenFilter;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import java.io.IOException;
public class TruncateFilter extends TokenFilter { public class TruncateFilter extends TokenFilter {
private final int maxTokenLength; private final int maxTokenLength;

2
modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java → modules/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * 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.index.AtomicReaderContext;
import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.FunctionValues;

8
modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java → modules/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java
View File

@ -15,8 +15,11 @@
* limitations under the License. * 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.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.AtomicReader;
@ -25,9 +28,6 @@ import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldCache.DoubleParser; 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 org.apache.lucene.util.Bits;
import java.io.IOException; import java.io.IOException;

4
modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java → modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesFieldInfo.java
View File

@ -15,9 +15,9 @@
* limitations under the License. * 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 { public class TwoDoublesFieldInfo implements SpatialFieldInfo {

24
modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java → modules/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
View File

@ -15,15 +15,8 @@
* limitations under the License. * 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.context.SpatialContext;
import com.spatial4j.core.exception.InvalidShapeException; import com.spatial4j.core.exception.InvalidShapeException;
import com.spatial4j.core.exception.UnsupportedSpatialOperation; 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.Point;
import com.spatial4j.core.shape.Rectangle; import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.Shape;
import org.apache.lucene.spatial.strategy.SpatialStrategy; import org.apache.lucene.document.Field;
import org.apache.lucene.spatial.strategy.util.CachingDoubleValueSource; import org.apache.lucene.document.FieldType;
import org.apache.lucene.spatial.strategy.util.NumericFieldInfo; import org.apache.lucene.index.IndexableField;
import org.apache.lucene.spatial.strategy.util.ValueSourceFilter; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

12
modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
View File

@ -18,18 +18,16 @@
package org.apache.lucene.spatial; 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.context.SpatialContext;
import com.spatial4j.core.io.sample.SampleData; import com.spatial4j.core.io.sample.SampleData;
import com.spatial4j.core.io.sample.SampleDataReader; import com.spatial4j.core.io.sample.SampleDataReader;
import com.spatial4j.core.query.SpatialArgsParser; import com.spatial4j.core.query.SpatialArgsParser;
import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.Shape;
import org.apache.lucene.spatial.strategy.SpatialFieldInfo; import junit.framework.Assert;
import org.apache.lucene.spatial.strategy.SpatialStrategy; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

6
modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java → modules/spatial/src/test/org/apache/lucene/spatial/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
View File

@ -15,13 +15,13 @@
* limitations under the License. * 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.SpatialContext;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo; import org.apache.lucene.spatial.SimpleSpatialFieldInfo;
import org.apache.lucene.spatial.strategy.prefix.tree.GeohashPrefixTree;
import org.apache.lucene.spatial.SpatialMatchConcern; import org.apache.lucene.spatial.SpatialMatchConcern;
import org.apache.lucene.spatial.StrategyTestCase; import org.apache.lucene.spatial.StrategyTestCase;
import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree;
import org.junit.Test; import org.junit.Test;
import java.io.IOException; import java.io.IOException;

2
modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java → modules/spatial/src/test/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategyTestCase.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * 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.SpatialContext;
import com.spatial4j.core.context.simple.SimpleSpatialContext; import com.spatial4j.core.context.simple.SimpleSpatialContext;

6
modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java → modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestSpatialPrefixField.java
View File

@ -15,13 +15,13 @@
* limitations under the License. * 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.Arrays;
import java.util.List; import java.util.List;
import org.junit.Test;
/** /**
* This is just a quick idea for *simple* tests * This is just a quick idea for *simple* tests

12
modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java → modules/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
View File

@ -15,19 +15,19 @@
* limitations under the License. * 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.SpatialContext;
import com.spatial4j.core.context.simple.SimpleSpatialContext; import com.spatial4j.core.context.simple.SimpleSpatialContext;
import com.spatial4j.core.query.SpatialArgsParser; import com.spatial4j.core.query.SpatialArgsParser;
import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.simple.PointImpl; import com.spatial4j.core.shape.simple.PointImpl;
import org.apache.lucene.spatial.strategy.SimpleSpatialFieldInfo; import org.apache.lucene.document.Document;
import org.apache.lucene.spatial.strategy.prefix.tree.QuadPrefixTree; 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.SpatialTestCase;
import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree;
import org.junit.Test; import org.junit.Test;
import java.io.IOException; import java.io.IOException;

6
modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/tree/SpatialPrefixTreeTest.java → modules/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java
View File

@ -15,15 +15,11 @@
* limitations under the License. * 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.context.simple.SimpleSpatialContext;
import com.spatial4j.core.shape.Rectangle; import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape; 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.Before;
import org.junit.Test; import org.junit.Test;

6
modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java → modules/spatial/src/test/org/apache/lucene/spatial/vector/BaseTwoDoublesStrategyTestCase.java
View File

@ -15,13 +15,13 @@
* limitations under the License. * 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 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.SpatialMatchConcern;
import org.apache.lucene.spatial.StrategyTestCase; import org.apache.lucene.spatial.StrategyTestCase;
import org.apache.lucene.spatial.util.NumericFieldInfo;
import org.junit.Test; import org.junit.Test;
import java.io.IOException; import java.io.IOException;

2
modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java → modules/spatial/src/test/org/apache/lucene/spatial/vector/TwoDoublesStrategyTestCase.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * 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.SpatialContext;
import com.spatial4j.core.context.simple.SimpleSpatialContext; import com.spatial4j.core.context.simple.SimpleSpatialContext;