From f18502ed419b511a68d1467e0aecd5ff91da90c0 Mon Sep 17 00:00:00 2001 From: Grant Ingersoll Date: Tue, 20 Jul 2010 20:17:54 +0000 Subject: [PATCH] SOLR-1568: moved DistanceUtils up one package, as it isn't tier specific git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@965984 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/lucene/spatial/{tier => }/DistanceUtils.java | 7 ++++--- .../lucene/spatial/geohash/GeoHashDistanceFilter.java | 2 +- .../org/apache/lucene/spatial/tier/DistanceHandler.java | 2 ++ .../apache/lucene/spatial/tier/LatLongDistanceFilter.java | 1 + .../spatial/tier/projections/SinusoidalProjector.java | 2 -- .../test/org/apache/lucene/spatial/DistanceUtilsTest.java | 3 +-- .../test/org/apache/lucene/spatial/tier/DistanceCheck.java | 2 ++ .../test/org/apache/lucene/spatial/tier/TestCartesian.java | 1 + .../spatial/tier/projections/SinusoidalProjectorTest.java | 3 --- solr/src/java/org/apache/solr/schema/GeoHashField.java | 4 ++-- solr/src/java/org/apache/solr/schema/LatLonType.java | 3 +-- solr/src/java/org/apache/solr/schema/PointType.java | 6 +++--- .../java/org/apache/solr/search/SpatialFilterQParser.java | 2 +- .../src/java/org/apache/solr/search/ValueSourceParser.java | 2 +- .../search/function/distance/GeohashHaversineFunction.java | 2 +- .../solr/search/function/distance/HaversineFunction.java | 2 +- .../search/function/distance/SquaredEuclideanFunction.java | 2 +- .../search/function/distance/VectorDistanceFunction.java | 2 +- .../search/function/distance/DistanceFunctionTest.java | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) rename lucene/contrib/spatial/src/java/org/apache/lucene/spatial/{tier => }/DistanceUtils.java (98%) diff --git a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceUtils.java b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java similarity index 98% rename from lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceUtils.java rename to lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java index 464db155a33..08f2feaff7a 100644 --- a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceUtils.java +++ b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package org.apache.lucene.spatial.tier; +package org.apache.lucene.spatial; import org.apache.lucene.spatial.geometry.DistanceUnits; import org.apache.lucene.spatial.geometry.FloatLatLng; import org.apache.lucene.spatial.geometry.LatLng; import org.apache.lucene.spatial.geometry.shape.LLRect; import org.apache.lucene.spatial.geometry.shape.Rectangle; +import org.apache.lucene.spatial.tier.InvalidGeoException; /** *

NOTE: This API is still in @@ -312,9 +313,9 @@ public class DistanceUtils { * @param externalVal The value to parse * @param dimension The expected number of values for the point * @return An array of the values that make up the point (aka vector) - * @throws InvalidGeoException if the dimension specified does not match the number of values in the externalValue. + * @throws org.apache.lucene.spatial.tier.InvalidGeoException if the dimension specified does not match the number of values in the externalValue. */ - public static String[] parsePoint(String[] out, String externalVal, int dimension) throws InvalidGeoException{ + public static String[] parsePoint(String[] out, String externalVal, int dimension) throws InvalidGeoException { //TODO: Should we support sparse vectors? if (out == null || out.length != dimension) out = new String[dimension]; int idx = externalVal.indexOf(','); diff --git a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java index 87f3424c445..69431f71f26 100644 --- a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java +++ b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java @@ -25,9 +25,9 @@ import org.apache.lucene.search.FieldCache.DocTerms; import org.apache.lucene.search.Filter; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.FilteredDocIdSet; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.util.BytesRef; import org.apache.lucene.spatial.tier.DistanceFilter; -import org.apache.lucene.spatial.tier.DistanceUtils; /**

NOTE: This API is still in diff --git a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java index c438f9ac8b4..836dab3bd03 100644 --- a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java +++ b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java @@ -17,6 +17,8 @@ package org.apache.lucene.spatial.tier; +import org.apache.lucene.spatial.DistanceUtils; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java index 98db7b8953f..44fba384701 100644 --- a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java +++ b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java @@ -23,6 +23,7 @@ import org.apache.lucene.search.FilteredDocIdSet; import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.Filter; import org.apache.lucene.search.DocIdSet; +import org.apache.lucene.spatial.DistanceUtils; /** diff --git a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java index d965fffe03b..42ed3cea239 100644 --- a/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java +++ b/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java @@ -17,8 +17,6 @@ package org.apache.lucene.spatial.tier.projections; -import org.apache.lucene.spatial.tier.DistanceUtils; - /** * Based on Sinusoidal Projections * Project a latitude / longitude on a 2D cartesian map diff --git a/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/DistanceUtilsTest.java b/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/DistanceUtilsTest.java index 9884b548b4a..f0e0e30336d 100644 --- a/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/DistanceUtilsTest.java +++ b/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/DistanceUtilsTest.java @@ -1,7 +1,6 @@ package org.apache.lucene.spatial; import junit.framework.TestCase; -import org.apache.lucene.spatial.tier.DistanceUtils; import org.apache.lucene.spatial.tier.InvalidGeoException; @@ -180,7 +179,7 @@ public class DistanceUtilsTest extends TestCase { try { - parse = org.apache.lucene.spatial.tier.DistanceUtils.parsePoint(null, "89.0 , ", 3); + parse = DistanceUtils.parsePoint(null, "89.0 , ", 3); assertTrue(false); } catch (InvalidGeoException e) { } diff --git a/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/DistanceCheck.java b/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/DistanceCheck.java index 04c6c15351b..71c5f02beb1 100644 --- a/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/DistanceCheck.java +++ b/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/DistanceCheck.java @@ -16,6 +16,8 @@ */ package org.apache.lucene.spatial.tier; +import org.apache.lucene.spatial.DistanceUtils; + import java.text.DecimalFormat; diff --git a/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java b/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java index 47fd2c77efe..c42149f6820 100644 --- a/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java +++ b/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java @@ -40,6 +40,7 @@ import org.apache.lucene.search.function.CustomScoreQuery; import org.apache.lucene.search.function.CustomScoreProvider; import org.apache.lucene.search.function.FieldScoreQuery; import org.apache.lucene.search.function.FieldScoreQuery.Type; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.geohash.GeoHashUtils; import org.apache.lucene.spatial.geometry.DistanceUnits; import org.apache.lucene.spatial.geometry.FloatLatLng; diff --git a/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projections/SinusoidalProjectorTest.java b/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projections/SinusoidalProjectorTest.java index db11db3ec3a..8cb11fa17de 100644 --- a/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projections/SinusoidalProjectorTest.java +++ b/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/projections/SinusoidalProjectorTest.java @@ -1,10 +1,7 @@ package org.apache.lucene.spatial.tier.projections; -import org.apache.lucene.spatial.tier.DistanceUtils; import org.junit.Test; -import static junit.framework.Assert.*; - /** * diff --git a/solr/src/java/org/apache/solr/schema/GeoHashField.java b/solr/src/java/org/apache/solr/schema/GeoHashField.java index 506b08372c5..9be613051fe 100644 --- a/solr/src/java/org/apache/solr/schema/GeoHashField.java +++ b/solr/src/java/org/apache/solr/schema/GeoHashField.java @@ -21,7 +21,7 @@ import org.apache.lucene.document.Fieldable; import org.apache.lucene.search.Query; import org.apache.lucene.search.SortField; import org.apache.lucene.spatial.geohash.GeoHashUtils; -import org.apache.lucene.spatial.tier.DistanceUtils; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.tier.InvalidGeoException; import org.apache.solr.common.SolrException; import org.apache.solr.response.TextResponseWriter; @@ -42,7 +42,7 @@ import java.io.IOException; * href="http://en.wikipedia.org/wiki/Geohash">Geohash field. The field is * provided as a lat/lon pair and is internally represented as a string. * - * @see org.apache.lucene.spatial.tier.DistanceUtils#parseLatitudeLongitude(double[], String) + * @see org.apache.lucene.spatial.DistanceUtils#parseLatitudeLongitude(double[], String) */ public class GeoHashField extends FieldType implements SpatialQueryable { diff --git a/solr/src/java/org/apache/solr/schema/LatLonType.java b/solr/src/java/org/apache/solr/schema/LatLonType.java index 0de85b196a6..3043c9c5300 100644 --- a/solr/src/java/org/apache/solr/schema/LatLonType.java +++ b/solr/src/java/org/apache/solr/schema/LatLonType.java @@ -22,9 +22,8 @@ import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.SortField; -import org.apache.lucene.spatial.tier.DistanceUtils; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.tier.InvalidGeoException; -import org.apache.lucene.spatial.tier.projections.CartesianTierPlotter; import org.apache.solr.common.SolrException; import org.apache.solr.response.TextResponseWriter; import org.apache.solr.response.XMLWriter; diff --git a/solr/src/java/org/apache/solr/schema/PointType.java b/solr/src/java/org/apache/solr/schema/PointType.java index e3941daef2b..55a9df50be4 100644 --- a/solr/src/java/org/apache/solr/schema/PointType.java +++ b/solr/src/java/org/apache/solr/schema/PointType.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.SortField; -import org.apache.lucene.spatial.tier.DistanceUtils; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.tier.InvalidGeoException; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.MapSolrParams; @@ -201,8 +201,8 @@ public class PointType extends CoordinateFieldType implements SpatialQueryable { } else { BooleanQuery tmp = new BooleanQuery(); //TODO: Handle distance measures, as this assumes Euclidean - double [] ur = org.apache.lucene.spatial.tier.DistanceUtils.vectorBoxCorner(point, null, options.distance, true); - double [] ll = org.apache.lucene.spatial.tier.DistanceUtils.vectorBoxCorner(point, null, options.distance, false); + double [] ur = DistanceUtils.vectorBoxCorner(point, null, options.distance, true); + double [] ll = DistanceUtils.vectorBoxCorner(point, null, options.distance, false); for (int i = 0; i < ur.length; i++) { SchemaField subSF = subField(options.field, i); Query range = subSF.getType().getRangeQuery(parser, subSF, String.valueOf(ll[i]), String.valueOf(ur[i]), true, true); diff --git a/solr/src/java/org/apache/solr/search/SpatialFilterQParser.java b/solr/src/java/org/apache/solr/search/SpatialFilterQParser.java index 325ba46ae23..6c805831726 100644 --- a/solr/src/java/org/apache/solr/search/SpatialFilterQParser.java +++ b/solr/src/java/org/apache/solr/search/SpatialFilterQParser.java @@ -20,7 +20,7 @@ package org.apache.solr.search; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; import org.apache.lucene.spatial.geometry.DistanceUnits; -import org.apache.lucene.spatial.tier.DistanceUtils; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.SolrParams; diff --git a/solr/src/java/org/apache/solr/search/ValueSourceParser.java b/solr/src/java/org/apache/solr/search/ValueSourceParser.java index 46cc1bb09c4..a7f2d145fd7 100755 --- a/solr/src/java/org/apache/solr/search/ValueSourceParser.java +++ b/solr/src/java/org/apache/solr/search/ValueSourceParser.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.spell.JaroWinklerDistance; import org.apache.lucene.search.spell.LevensteinDistance; import org.apache.lucene.search.spell.NGramDistance; import org.apache.lucene.search.spell.StringDistance; -import org.apache.lucene.spatial.tier.DistanceUtils; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.UnicodeUtil; import org.apache.solr.common.SolrException; diff --git a/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java b/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java index 4aa4d40a66a..5e26fb41554 100644 --- a/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java @@ -17,7 +17,7 @@ package org.apache.solr.search.function.distance; */ -import org.apache.lucene.spatial.tier.DistanceUtils; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.solr.search.function.ValueSource; import org.apache.solr.search.function.DocValues; import org.apache.lucene.index.IndexReader; diff --git a/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java b/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java index 2fff2826564..26ee222b44f 100644 --- a/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java @@ -18,7 +18,7 @@ package org.apache.solr.search.function.distance; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.Searcher; -import org.apache.lucene.spatial.tier.DistanceUtils; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.solr.common.SolrException; import org.apache.solr.search.function.MultiValueSource; import org.apache.solr.search.function.DocValues; diff --git a/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java b/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java index d01973391d3..729e7de9e3c 100644 --- a/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java @@ -16,7 +16,7 @@ package org.apache.solr.search.function.distance; * limitations under the License. */ -import org.apache.lucene.spatial.tier.DistanceUtils; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.solr.search.function.DocValues; import org.apache.solr.search.function.MultiValueSource; diff --git a/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java b/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java index c259611e5dd..5d876836b89 100644 --- a/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java +++ b/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java @@ -18,7 +18,7 @@ package org.apache.solr.search.function.distance; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.Searcher; -import org.apache.lucene.spatial.tier.DistanceUtils; +import org.apache.lucene.spatial.DistanceUtils; import org.apache.solr.common.SolrException; import org.apache.solr.search.function.DocValues; import org.apache.solr.search.function.MultiValueSource; diff --git a/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java b/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java index c1bf97c3f2f..74364467cb2 100644 --- a/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java +++ b/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java @@ -16,8 +16,8 @@ package org.apache.solr.search.function.distance; * limitations under the License. */ +import org.apache.lucene.spatial.DistanceUtils; import org.apache.lucene.spatial.geohash.GeoHashUtils; -import org.apache.lucene.spatial.tier.DistanceUtils; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; import org.junit.BeforeClass;