Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Vector2D.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Vector2D.java (revision 812248) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Vector2D.java Wed Dec 01 23:31:01 NZDT 2010 @@ -24,7 +24,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class Vector2D { private double x; private double y; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/DistanceUnits.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/DistanceUnits.java (revision 962727) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/DistanceUnits.java Wed Dec 01 23:30:56 NZDT 2010 @@ -20,7 +20,10 @@ /** * Enum representing difference distance units, currently only kilometers and * miles + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public enum DistanceUnits { MILES("miles", 3959, 24902), Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FixedLatLng.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FixedLatLng.java (revision 812248) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FixedLatLng.java Wed Dec 01 23:30:53 NZDT 2010 @@ -21,7 +21,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class FixedLatLng extends LatLng { public static final double SCALE_FACTOR=1000000; public static final int SCALE_FACTOR_INT=1000000; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java (revision 965984) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java Wed Dec 01 23:31:31 NZDT 2010 @@ -33,8 +33,10 @@ /**

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ - +@Deprecated public class GeoHashDistanceFilter extends DistanceFilter { /** Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java (revision 965984) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java Wed Dec 01 23:30:17 NZDT 2010 @@ -30,7 +30,9 @@ * flux and might change in incompatible ways in the next * release. * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class DistanceHandler { public enum Precision {EXACT, TWOFEET, TWENTYFEET, TWOHUNDREDFEET} Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/LatLng.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/LatLng.java (revision 934251) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/LatLng.java Wed Dec 01 23:30:46 NZDT 2010 @@ -27,7 +27,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public abstract class LatLng { public abstract boolean isNormalized(); Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Point2D.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Point2D.java (revision 812248) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Point2D.java Wed Dec 01 23:31:10 NZDT 2010 @@ -24,7 +24,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class Point2D { private double x; private double y; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashUtils.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashUtils.java (revision 896240) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashUtils.java Wed Dec 01 23:31:28 NZDT 2010 @@ -23,7 +23,10 @@ /** * Utilities for encoding and decoding geohashes. Based on * http://en.wikipedia.org/wiki/Geohash. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class GeoHashUtils { private static final char[] BASE_32 = {'0', '1', '2', '3', '4', '5', '6', Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/CartesianPoint.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/CartesianPoint.java (revision 812248) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/CartesianPoint.java Wed Dec 01 23:30:59 NZDT 2010 @@ -25,7 +25,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class CartesianPoint { private int x; private int y; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FloatLatLng.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FloatLatLng.java (revision 812248) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FloatLatLng.java Wed Dec 01 23:30:49 NZDT 2010 @@ -21,7 +21,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class FloatLatLng extends LatLng { private double lat; private double lng; Index: lucene/contrib/spatial/src/java/overview.html =================================================================== --- lucene/contrib/spatial/src/java/overview.html (revision 897712) +++ lucene/contrib/spatial/src/java/overview.html Wed Dec 01 23:32:05 NZDT 2010 @@ -30,17 +30,11 @@

See here for details on the technical approach.

-

Unfortunately, this package is still very new, and has little to no -documentation. It's best to ask for pointers on -java-user@lucene.apache.org, and look at the unit tests included in -the source distribution.

- -

There are also known issues, eg at +

The package suffers from known issues including least LUCENE-1781 and LUCENE-1815.

-

NOTE: This package is still in flux and -might change in incompatible ways in the next release. +

Because of these issues, the package is deprecated (3.1) and will be removed in a future version

Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/IntersectCase.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/IntersectCase.java (revision 810951) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/IntersectCase.java Wed Dec 01 23:31:18 NZDT 2010 @@ -22,7 +22,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public enum IntersectCase { WITHIN, CONTAINS, Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java (revision 934251) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java Wed Dec 01 23:30:05 NZDT 2010 @@ -25,7 +25,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class Shape implements Serializable{ private List area = new ArrayList(); Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java (revision 995997) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java Wed Dec 01 23:30:24 NZDT 2010 @@ -28,7 +28,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class DistanceFieldComparatorSource extends FieldComparatorSource { private static final long serialVersionUID = 1L; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Geometry2D.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Geometry2D.java (revision 810951) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Geometry2D.java Wed Dec 01 23:31:21 NZDT 2010 @@ -24,7 +24,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public interface Geometry2D { /** * Translate according to the vector Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/CartesianTierPlotter.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/CartesianTierPlotter.java (revision 934251) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/CartesianTierPlotter.java Wed Dec 01 23:30:42 NZDT 2010 @@ -21,7 +21,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class CartesianTierPlotter { public static final String DEFALT_FIELD_PREFIX = "_tier_"; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianPolyFilterBuilder.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianPolyFilterBuilder.java (revision 934860) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianPolyFilterBuilder.java Wed Dec 01 23:30:31 NZDT 2010 @@ -33,7 +33,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class CartesianPolyFilterBuilder { // Finer granularity than 1 mile isn't accurate with Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java (revision 984715) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java Wed Dec 01 23:30:27 NZDT 2010 @@ -33,7 +33,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class CartesianShapeFilter extends Filter { private final Shape shape; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LLRect.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LLRect.java (revision 934251) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LLRect.java Wed Dec 01 23:31:12 NZDT 2010 @@ -28,7 +28,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class LLRect { private LatLng ll, ur; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LineSegment.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LineSegment.java (revision 812248) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LineSegment.java Wed Dec 01 23:31:15 NZDT 2010 @@ -24,7 +24,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class LineSegment { public final Point2D A = new Point2D(); public final Point2D B = new Point2D(); Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java (revision 1040463) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java Wed Dec 01 23:30:36 NZDT 2010 @@ -28,7 +28,7 @@ * flux and might change in incompatible ways in the next * release. * - * @deprecated (3.1) Until we can put in place proper tests and a proper fix. + * @deprecated (3.1) Will be removed in a future version */ @Deprecated public class SinusoidalProjector implements IProjector { Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java (revision 810951) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java Wed Dec 01 23:30:12 NZDT 2010 @@ -21,7 +21,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class InvalidGeoException extends Exception { /** Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Rectangle.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Rectangle.java (revision 812248) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Rectangle.java Wed Dec 01 23:31:06 NZDT 2010 @@ -24,7 +24,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class Rectangle implements Geometry2D { private Point2D ptMin, ptMax; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/IProjector.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/IProjector.java (revision 810951) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/IProjector.java Wed Dec 01 23:30:39 NZDT 2010 @@ -21,7 +21,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public interface IProjector { public String coordsAsString(double latitude, double longitude); public double[] coords(double latitude, double longitude); Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java (revision 965984) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java Wed Dec 01 23:30:09 NZDT 2010 @@ -30,7 +30,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class LatLongDistanceFilter extends DistanceFilter { /** Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java (revision 932748) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java Wed Dec 01 23:30:14 NZDT 2010 @@ -28,7 +28,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class DistanceQueryBuilder { private static final long serialVersionUID = 1L; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java (revision 833867) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java Wed Dec 01 23:30:21 NZDT 2010 @@ -29,7 +29,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public abstract class DistanceFilter extends Filter { final protected Filter startingFilter; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Ellipse.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Ellipse.java (revision 811070) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Ellipse.java Wed Dec 01 23:31:24 NZDT 2010 @@ -24,7 +24,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ +@Deprecated public class Ellipse implements Geometry2D { private Point2D center; Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java =================================================================== --- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java (revision 1000428) +++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java Wed Dec 01 23:29:56 NZDT 2010 @@ -28,8 +28,10 @@ *

NOTE: This API is still in * flux and might change in incompatible ways in the next * release. + * + * @deprecated (3.1) Will be removed in a future version */ - +@Deprecated public class DistanceUtils { public static final double DEGREES_TO_RADIANS = Math.PI / 180.0;