From ee3cb864645a7cacf90bb7b8ec0e8bcfd7e13ace Mon Sep 17 00:00:00 2001 From: Michael McCandless Date: Sun, 12 Jul 2015 18:04:12 +0000 Subject: [PATCH] LUCENE-6607: factor geo3d out to its own spatial3d module git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1690496 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/CHANGES.txt | 3 ++ lucene/build.xml | 3 ++ lucene/module-build.xml | 22 ++++++++++++++ lucene/spatial/build.xml | 6 ++-- .../lucene/spatial/spatial4j/Geo3dShape.java | 12 ++++---- .../spatial/spatial4j/Geo3dRptTest.java | 14 ++++----- .../Geo3dShapeRectRelationTestCase.java | 18 +++++------ ...Geo3dShapeSphereModelRectRelationTest.java | 16 +++++----- .../Geo3dShapeWGS84ModelRectRelationTest.java | 14 ++++----- .../spatial/spatial4j/geo3d/GeoPointTest.java | 5 +++- lucene/spatial3d/build.xml | 30 +++++++++++++++++++ lucene/spatial3d/ivy.xml | 21 +++++++++++++ .../org/apache/lucene}/geo3d/ArcDistance.java | 2 +- .../lucene}/geo3d/BasePlanetObject.java | 2 +- .../java/org/apache/lucene}/geo3d/Bounds.java | 2 +- .../apache/lucene}/geo3d/DistanceStyle.java | 2 +- .../org/apache/lucene}/geo3d/GeoArea.java | 2 +- .../apache/lucene}/geo3d/GeoAreaFactory.java | 4 +-- .../org/apache/lucene}/geo3d/GeoBBox.java | 2 +- .../apache/lucene}/geo3d/GeoBBoxFactory.java | 4 +-- .../org/apache/lucene}/geo3d/GeoBaseBBox.java | 2 +- .../lucene}/geo3d/GeoBaseDistanceShape.java | 2 +- .../lucene}/geo3d/GeoBaseMembershipShape.java | 2 +- .../apache/lucene}/geo3d/GeoBaseShape.java | 2 +- .../org/apache/lucene}/geo3d/GeoCircle.java | 2 +- .../geo3d/GeoCompositeMembershipShape.java | 2 +- .../lucene}/geo3d/GeoConvexPolygon.java | 2 +- .../geo3d/GeoDegenerateHorizontalLine.java | 2 +- .../geo3d/GeoDegenerateLatitudeZone.java | 2 +- .../geo3d/GeoDegenerateLongitudeSlice.java | 2 +- .../lucene}/geo3d/GeoDegeneratePoint.java | 2 +- .../geo3d/GeoDegenerateVerticalLine.java | 2 +- .../org/apache/lucene}/geo3d/GeoDistance.java | 2 +- .../lucene}/geo3d/GeoDistanceShape.java | 2 +- .../apache/lucene}/geo3d/GeoLatitudeZone.java | 2 +- .../lucene}/geo3d/GeoLongitudeSlice.java | 2 +- .../lucene}/geo3d/GeoMembershipShape.java | 2 +- .../lucene}/geo3d/GeoNorthLatitudeZone.java | 2 +- .../lucene}/geo3d/GeoNorthRectangle.java | 2 +- .../lucene}/geo3d/GeoOutsideDistance.java | 2 +- .../org/apache/lucene}/geo3d/GeoPath.java | 2 +- .../org/apache/lucene}/geo3d/GeoPoint.java | 4 +-- .../lucene}/geo3d/GeoPolygonFactory.java | 2 +- .../apache/lucene}/geo3d/GeoRectangle.java | 2 +- .../org/apache/lucene}/geo3d/GeoShape.java | 2 +- .../org/apache/lucene}/geo3d/GeoSizeable.java | 2 +- .../lucene}/geo3d/GeoSouthLatitudeZone.java | 2 +- .../lucene}/geo3d/GeoSouthRectangle.java | 2 +- .../GeoWideDegenerateHorizontalLine.java | 2 +- .../lucene}/geo3d/GeoWideLongitudeSlice.java | 2 +- .../lucene}/geo3d/GeoWideNorthRectangle.java | 2 +- .../lucene}/geo3d/GeoWideRectangle.java | 2 +- .../lucene}/geo3d/GeoWideSouthRectangle.java | 2 +- .../org/apache/lucene}/geo3d/GeoWorld.java | 2 +- .../apache/lucene}/geo3d/LinearDistance.java | 2 +- .../lucene}/geo3d/LinearSquaredDistance.java | 2 +- .../org/apache/lucene}/geo3d/Membership.java | 2 +- .../apache/lucene}/geo3d/NormalDistance.java | 2 +- .../lucene}/geo3d/NormalSquaredDistance.java | 2 +- .../java/org/apache/lucene}/geo3d/Plane.java | 2 +- .../org/apache/lucene}/geo3d/PlanetModel.java | 4 +-- .../org/apache/lucene}/geo3d/SidedPlane.java | 2 +- .../java/org/apache/lucene}/geo3d/Tools.java | 4 +-- .../java/org/apache/lucene}/geo3d/Vector.java | 2 +- .../apache/lucene}/geo3d/package-info.java | 2 +- lucene/spatial3d/src/java/overview.html | 29 ++++++++++++++++++ .../org/apache/lucene}/geo3d/GeoBBoxTest.java | 2 +- .../apache/lucene}/geo3d/GeoCircleTest.java | 2 +- .../lucene}/geo3d/GeoConvexPolygonTest.java | 2 +- .../apache/lucene}/geo3d/GeoModelTest.java | 2 +- .../org/apache/lucene}/geo3d/GeoPathTest.java | 2 +- .../apache/lucene}/geo3d/GeoPolygonTest.java | 2 +- .../org/apache/lucene}/geo3d/PlaneTest.java | 2 +- 73 files changed, 218 insertions(+), 105 deletions(-) create mode 100644 lucene/spatial3d/build.xml create mode 100644 lucene/spatial3d/ivy.xml rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/ArcDistance.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/BasePlanetObject.java (96%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/Bounds.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/DistanceStyle.java (98%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoArea.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoAreaFactory.java (92%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoBBox.java (96%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoBBoxFactory.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoBaseBBox.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoBaseDistanceShape.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoBaseMembershipShape.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoBaseShape.java (96%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoCircle.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoCompositeMembershipShape.java (98%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoConvexPolygon.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoDegenerateHorizontalLine.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoDegenerateLatitudeZone.java (98%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoDegenerateLongitudeSlice.java (98%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoDegeneratePoint.java (98%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoDegenerateVerticalLine.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoDistance.java (98%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoDistanceShape.java (95%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoLatitudeZone.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoLongitudeSlice.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoMembershipShape.java (95%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoNorthLatitudeZone.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoNorthRectangle.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoOutsideDistance.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoPath.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoPoint.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoPolygonFactory.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoRectangle.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoShape.java (98%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoSizeable.java (96%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoSouthLatitudeZone.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoSouthRectangle.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoWideDegenerateHorizontalLine.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoWideLongitudeSlice.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoWideNorthRectangle.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoWideRectangle.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoWideSouthRectangle.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/GeoWorld.java (98%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/LinearDistance.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/LinearSquaredDistance.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/Membership.java (96%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/NormalDistance.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/NormalSquaredDistance.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/Plane.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/PlanetModel.java (97%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/SidedPlane.java (98%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/Tools.java (96%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/Vector.java (99%) rename lucene/{spatial/src/java/org/apache/lucene/spatial/spatial4j => spatial3d/src/java/org/apache/lucene}/geo3d/package-info.java (94%) create mode 100644 lucene/spatial3d/src/java/overview.html rename lucene/{spatial/src/test/org/apache/lucene/spatial/spatial4j => spatial3d/src/test/org/apache/lucene}/geo3d/GeoBBoxTest.java (99%) rename lucene/{spatial/src/test/org/apache/lucene/spatial/spatial4j => spatial3d/src/test/org/apache/lucene}/geo3d/GeoCircleTest.java (99%) rename lucene/{spatial/src/test/org/apache/lucene/spatial/spatial4j => spatial3d/src/test/org/apache/lucene}/geo3d/GeoConvexPolygonTest.java (98%) rename lucene/{spatial/src/test/org/apache/lucene/spatial/spatial4j => spatial3d/src/test/org/apache/lucene}/geo3d/GeoModelTest.java (98%) rename lucene/{spatial/src/test/org/apache/lucene/spatial/spatial4j => spatial3d/src/test/org/apache/lucene}/geo3d/GeoPathTest.java (99%) rename lucene/{spatial/src/test/org/apache/lucene/spatial/spatial4j => spatial3d/src/test/org/apache/lucene}/geo3d/GeoPolygonTest.java (99%) rename lucene/{spatial/src/test/org/apache/lucene/spatial/spatial4j => spatial3d/src/test/org/apache/lucene}/geo3d/PlaneTest.java (97%) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index f89861eab04..9c3dd45a9bf 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -199,6 +199,9 @@ API Changes deprecated in favour of BitSetProducer and QueryBitSetProducer, which do not extend oal.search.Filter. (Adrien Grand) +* LUCENE-6607: Factor out geo3d into its own spatial3d module. (Karl + Wright, Nick Knize, David Smiley, Mike McCandless) + Bug fixes * LUCENE-6500: ParallelCompositeReader did not always call diff --git a/lucene/build.xml b/lucene/build.xml index 357e68d5df5..48e1e41ef13 100644 --- a/lucene/build.xml +++ b/lucene/build.xml @@ -188,6 +188,9 @@ + + + diff --git a/lucene/module-build.xml b/lucene/module-build.xml index 5a8fe9b9a69..a0b4dc17590 100644 --- a/lucene/module-build.xml +++ b/lucene/module-build.xml @@ -585,6 +585,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/lucene/spatial/build.xml b/lucene/spatial/build.xml index 1dc5cd5aedd..4c348eebcc6 100644 --- a/lucene/spatial/build.xml +++ b/lucene/spatial/build.xml @@ -33,6 +33,7 @@ + @@ -41,14 +42,15 @@ - + - + diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/Geo3dShape.java b/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/Geo3dShape.java index fe95fb49931..428ee9e9a65 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/Geo3dShape.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/Geo3dShape.java @@ -24,12 +24,12 @@ import com.spatial4j.core.shape.Rectangle; import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.SpatialRelation; import com.spatial4j.core.shape.impl.RectangleImpl; -import org.apache.lucene.spatial.spatial4j.geo3d.Bounds; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoArea; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoAreaFactory; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPoint; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoShape; -import org.apache.lucene.spatial.spatial4j.geo3d.PlanetModel; +import org.apache.lucene.geo3d.Bounds; +import org.apache.lucene.geo3d.GeoArea; +import org.apache.lucene.geo3d.GeoAreaFactory; +import org.apache.lucene.geo3d.GeoPoint; +import org.apache.lucene.geo3d.GeoShape; +import org.apache.lucene.geo3d.PlanetModel; /** * A Spatial4j Shape wrapping a {@link GeoShape} ("Geo3D") -- a 3D planar geometry based Spatial4j Shape implementation. diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java index 85b2fbd7432..82213191c4c 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java @@ -33,13 +33,13 @@ import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree; import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree; import org.apache.lucene.spatial.query.SpatialOperation; import org.apache.lucene.spatial.serialized.SerializedDVStrategy; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoBBoxFactory; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoCircle; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPath; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPoint; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPolygonFactory; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoShape; -import org.apache.lucene.spatial.spatial4j.geo3d.PlanetModel; +import org.apache.lucene.geo3d.GeoBBoxFactory; +import org.apache.lucene.geo3d.GeoCircle; +import org.apache.lucene.geo3d.GeoPath; +import org.apache.lucene.geo3d.GeoPoint; +import org.apache.lucene.geo3d.GeoPolygonFactory; +import org.apache.lucene.geo3d.GeoShape; +import org.apache.lucene.geo3d.PlanetModel; import org.junit.Test; import static com.spatial4j.core.distance.DistanceUtils.DEGREES_TO_RADIANS; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java index f4996bc30d9..377ad066e53 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java @@ -26,15 +26,15 @@ import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.distance.DistanceUtils; import com.spatial4j.core.shape.Circle; import com.spatial4j.core.shape.Point; -import org.apache.lucene.spatial.spatial4j.geo3d.Bounds; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoBBox; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoBBoxFactory; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoCircle; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPath; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPoint; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPolygonFactory; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoShape; -import org.apache.lucene.spatial.spatial4j.geo3d.PlanetModel; +import org.apache.lucene.geo3d.Bounds; +import org.apache.lucene.geo3d.GeoBBox; +import org.apache.lucene.geo3d.GeoBBoxFactory; +import org.apache.lucene.geo3d.GeoCircle; +import org.apache.lucene.geo3d.GeoPath; +import org.apache.lucene.geo3d.GeoPoint; +import org.apache.lucene.geo3d.GeoPolygonFactory; +import org.apache.lucene.geo3d.GeoShape; +import org.apache.lucene.geo3d.PlanetModel; import org.junit.Rule; import org.junit.Test; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java index 5e2ca7d6664..5df5c52fec4 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java @@ -21,14 +21,14 @@ import java.util.ArrayList; import java.util.List; import com.spatial4j.core.shape.Rectangle; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoArea; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoBBox; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoBBoxFactory; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoCircle; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPoint; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPolygonFactory; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoShape; -import org.apache.lucene.spatial.spatial4j.geo3d.PlanetModel; +import org.apache.lucene.geo3d.GeoArea; +import org.apache.lucene.geo3d.GeoBBox; +import org.apache.lucene.geo3d.GeoBBoxFactory; +import org.apache.lucene.geo3d.GeoCircle; +import org.apache.lucene.geo3d.GeoPoint; +import org.apache.lucene.geo3d.GeoPolygonFactory; +import org.apache.lucene.geo3d.GeoShape; +import org.apache.lucene.geo3d.PlanetModel; import org.junit.Test; public class Geo3dShapeSphereModelRectRelationTest extends Geo3dShapeRectRelationTestCase { diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java index b26f1623de6..1821a8b7b76 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java @@ -17,13 +17,13 @@ package org.apache.lucene.spatial.spatial4j; * limitations under the License. */ -import org.apache.lucene.spatial.spatial4j.geo3d.GeoArea; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoBBox; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoBBoxFactory; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoCircle; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPath; -import org.apache.lucene.spatial.spatial4j.geo3d.GeoPoint; -import org.apache.lucene.spatial.spatial4j.geo3d.PlanetModel; +import org.apache.lucene.geo3d.GeoArea; +import org.apache.lucene.geo3d.GeoBBox; +import org.apache.lucene.geo3d.GeoBBoxFactory; +import org.apache.lucene.geo3d.GeoCircle; +import org.apache.lucene.geo3d.GeoPath; +import org.apache.lucene.geo3d.GeoPoint; +import org.apache.lucene.geo3d.PlanetModel; import org.junit.Test; public class Geo3dShapeWGS84ModelRectRelationTest extends Geo3dShapeRectRelationTestCase { diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPointTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPointTest.java index 8e74f928cd8..0fcb55c3f31 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPointTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPointTest.java @@ -17,10 +17,13 @@ package org.apache.lucene.spatial.spatial4j.geo3d; * limitations under the License. */ -import com.spatial4j.core.distance.DistanceUtils; +import org.apache.lucene.geo3d.GeoPoint; +import org.apache.lucene.geo3d.PlanetModel; import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; +import com.spatial4j.core.distance.DistanceUtils; + import static com.carrotsearch.randomizedtesting.RandomizedTest.randomFloat; /** diff --git a/lucene/spatial3d/build.xml b/lucene/spatial3d/build.xml new file mode 100644 index 00000000000..fbe9e0685f7 --- /dev/null +++ b/lucene/spatial3d/build.xml @@ -0,0 +1,30 @@ + + + + + 3D spatial planar geometry APIs + + + + + + + + diff --git a/lucene/spatial3d/ivy.xml b/lucene/spatial3d/ivy.xml new file mode 100644 index 00000000000..e9d2ee74627 --- /dev/null +++ b/lucene/spatial3d/ivy.xml @@ -0,0 +1,21 @@ + + + + diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/ArcDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/ArcDistance.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/ArcDistance.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/ArcDistance.java index c056150f4bb..8649b5fe80a 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/ArcDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/ArcDistance.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/BasePlanetObject.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BasePlanetObject.java similarity index 96% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/BasePlanetObject.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/BasePlanetObject.java index 39255c8f5aa..13ca8daaa1a 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/BasePlanetObject.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BasePlanetObject.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Bounds.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Bounds.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Bounds.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/Bounds.java index 82ba62c442e..d4303b05d0b 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Bounds.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Bounds.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/DistanceStyle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/DistanceStyle.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/DistanceStyle.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/DistanceStyle.java index 7d11c3880fb..330a3939417 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/DistanceStyle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/DistanceStyle.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoArea.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoArea.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoArea.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoArea.java index 0fef21beaca..566ece47ab4 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoArea.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoArea.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoAreaFactory.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoAreaFactory.java similarity index 92% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoAreaFactory.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoAreaFactory.java index c273e9e3649..d7a45113e62 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoAreaFactory.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoAreaFactory.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,7 +18,7 @@ package org.apache.lucene.spatial.spatial4j.geo3d; */ /** - * Factory for {@link org.apache.lucene.spatial.spatial4j.geo3d.GeoArea}. + * Factory for {@link org.apache.lucene.geo3d.GeoArea}. * * @lucene.experimental */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBox.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBox.java similarity index 96% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBox.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBox.java index 37b47ae1496..bf2b2137513 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBox.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBox.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBoxFactory.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBoxFactory.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBoxFactory.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBoxFactory.java index 863aca57d1b..e0432df74a5 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBoxFactory.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBoxFactory.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,7 +18,7 @@ package org.apache.lucene.spatial.spatial4j.geo3d; */ /** - * Factory for {@link org.apache.lucene.spatial.spatial4j.geo3d.GeoBBox}. + * Factory for {@link org.apache.lucene.geo3d.GeoBBox}. * * @lucene.experimental */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseBBox.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseBBox.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseBBox.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseBBox.java index 48183bad601..b2a133ed361 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseBBox.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseBBox.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseDistanceShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseDistanceShape.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseDistanceShape.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseDistanceShape.java index ffdf53853b3..7b0a3b727d0 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseDistanceShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseDistanceShape.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseMembershipShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseMembershipShape.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseMembershipShape.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseMembershipShape.java index 941912c6ce3..ba8536e418a 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseMembershipShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseMembershipShape.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseShape.java similarity index 96% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseShape.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseShape.java index dac5c44df39..e0a35d42fee 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseShape.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoCircle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircle.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoCircle.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircle.java index 64ff34fb37a..0b914af9ee0 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoCircle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircle.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoCompositeMembershipShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositeMembershipShape.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoCompositeMembershipShape.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositeMembershipShape.java index a128cb5715e..bf5c58d3d6b 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoCompositeMembershipShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositeMembershipShape.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoConvexPolygon.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoConvexPolygon.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoConvexPolygon.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoConvexPolygon.java index f5c7cebf0dd..d69ff32bab6 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoConvexPolygon.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoConvexPolygon.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateHorizontalLine.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateHorizontalLine.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateHorizontalLine.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateHorizontalLine.java index 94dc38a2acc..fa03aa54df7 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateHorizontalLine.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateHorizontalLine.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateLatitudeZone.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLatitudeZone.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateLatitudeZone.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLatitudeZone.java index 3761f9aa7a3..539b9acdcf4 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateLatitudeZone.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLatitudeZone.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateLongitudeSlice.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLongitudeSlice.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateLongitudeSlice.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLongitudeSlice.java index 79d33dd81a2..8f726592b40 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateLongitudeSlice.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLongitudeSlice.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegeneratePoint.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegeneratePoint.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegeneratePoint.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegeneratePoint.java index 355b0f4eca1..528ff891069 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegeneratePoint.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegeneratePoint.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateVerticalLine.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateVerticalLine.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateVerticalLine.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateVerticalLine.java index b5b35d54959..11f7182ea69 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateVerticalLine.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateVerticalLine.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistance.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDistance.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistance.java index 4dc69911af2..87d1d54756a 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistance.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDistanceShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistanceShape.java similarity index 95% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDistanceShape.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistanceShape.java index 003dc3b7b96..253afce94f4 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDistanceShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistanceShape.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoLatitudeZone.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLatitudeZone.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoLatitudeZone.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLatitudeZone.java index 2703134650b..83ee559e899 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoLatitudeZone.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLatitudeZone.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoLongitudeSlice.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLongitudeSlice.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoLongitudeSlice.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLongitudeSlice.java index 358d25668e4..cff754c3d8a 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoLongitudeSlice.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLongitudeSlice.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoMembershipShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoMembershipShape.java similarity index 95% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoMembershipShape.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoMembershipShape.java index 3c3f64d3f7a..0b5b090cc91 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoMembershipShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoMembershipShape.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoNorthLatitudeZone.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthLatitudeZone.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoNorthLatitudeZone.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthLatitudeZone.java index c7145574e87..2cb576e2811 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoNorthLatitudeZone.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthLatitudeZone.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoNorthRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthRectangle.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoNorthRectangle.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthRectangle.java index ea7edf3f162..fcb764c5863 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoNorthRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthRectangle.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoOutsideDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoOutsideDistance.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoOutsideDistance.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoOutsideDistance.java index c3a345b8b09..79630b7bee9 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoOutsideDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoOutsideDistance.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPath.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPath.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPath.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPath.java index 7a002785a42..d9977ceb96c 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPath.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPath.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPoint.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPoint.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPoint.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPoint.java index 6194a5f312e..bdfb2ea7ffa 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPoint.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPoint.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -116,7 +116,7 @@ public class GeoPoint extends Vector { /** Compute an arc distance between two points. * Note: this is an angular distance, and not a surface distance, and is therefore independent of planet model. - * For surface distance, see {@link org.apache.lucene.spatial.spatial4j.geo3d.PlanetModel#surfaceDistance(GeoPoint, GeoPoint)} + * For surface distance, see {@link org.apache.lucene.geo3d.PlanetModel#surfaceDistance(GeoPoint, GeoPoint)} * @param v is the second point. * @return the angle, in radians, between the two points. */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPolygonFactory.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygonFactory.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPolygonFactory.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygonFactory.java index 0f1b48c990b..2e6f49fffb2 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPolygonFactory.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygonFactory.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoRectangle.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoRectangle.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoRectangle.java index 2555eca1992..4beb8e84829 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoRectangle.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoShape.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoShape.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoShape.java index cb6968bb007..e246e230b41 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoShape.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoSizeable.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSizeable.java similarity index 96% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoSizeable.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSizeable.java index 4c57b8037a3..b9aba9b127c 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoSizeable.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSizeable.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoSouthLatitudeZone.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthLatitudeZone.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoSouthLatitudeZone.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthLatitudeZone.java index c0a9efc1cad..5248d24af0b 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoSouthLatitudeZone.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthLatitudeZone.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoSouthRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthRectangle.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoSouthRectangle.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthRectangle.java index 592801453fa..39cd47cb153 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoSouthRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthRectangle.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideDegenerateHorizontalLine.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideDegenerateHorizontalLine.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideDegenerateHorizontalLine.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideDegenerateHorizontalLine.java index 05b307482e9..d69711724d1 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideDegenerateHorizontalLine.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideDegenerateHorizontalLine.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideLongitudeSlice.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideLongitudeSlice.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideLongitudeSlice.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideLongitudeSlice.java index ddcd3bf329f..a7f98d246c1 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideLongitudeSlice.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideLongitudeSlice.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideNorthRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideNorthRectangle.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideNorthRectangle.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideNorthRectangle.java index 842e32d9813..8596d7241ff 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideNorthRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideNorthRectangle.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideRectangle.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideRectangle.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideRectangle.java index 66735f16623..424d6cd6d47 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideRectangle.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideSouthRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideSouthRectangle.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideSouthRectangle.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideSouthRectangle.java index 3899afd3db8..d950e72098d 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWideSouthRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideSouthRectangle.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWorld.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWorld.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWorld.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWorld.java index 1e9e0ded3f3..ab4a2f0eb7c 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoWorld.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWorld.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/LinearDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearDistance.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/LinearDistance.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearDistance.java index 7184f20a4a9..ca20da62bc0 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/LinearDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearDistance.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/LinearSquaredDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearSquaredDistance.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/LinearSquaredDistance.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearSquaredDistance.java index accc0703930..eb750f0d976 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/LinearSquaredDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearSquaredDistance.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Membership.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Membership.java similarity index 96% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Membership.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/Membership.java index 6233b364bcc..e41d96c4494 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Membership.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Membership.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/NormalDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalDistance.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/NormalDistance.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalDistance.java index 90b1e3c8668..a4c61ff956b 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/NormalDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalDistance.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/NormalSquaredDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalSquaredDistance.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/NormalSquaredDistance.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalSquaredDistance.java index be3ded2f648..2a0578d43b0 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/NormalSquaredDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalSquaredDistance.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Plane.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Plane.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java index 27c4c9283c7..5c6a3669328 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Plane.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/PlanetModel.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PlanetModel.java similarity index 97% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/PlanetModel.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/PlanetModel.java index bed01f6a5f4..4a9a4820c65 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/PlanetModel.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PlanetModel.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -82,7 +82,7 @@ public class PlanetModel { * @param p1 is the first point. * @param p2 is the second point. * @return the adjusted angle, when multiplied by the mean earth radius, yields a surface distance. This will differ - * from GeoPoint.arcDistance() only when the planet model is not a sphere. @see {@link org.apache.lucene.spatial.spatial4j.geo3d.GeoPoint#arcDistance(GeoPoint)} + * from GeoPoint.arcDistance() only when the planet model is not a sphere. @see {@link org.apache.lucene.geo3d.GeoPoint#arcDistance(GeoPoint)} */ public double surfaceDistance(final GeoPoint p1, final GeoPoint p2) { final double latA = p1.getLatitude(); diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/SidedPlane.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/SidedPlane.java similarity index 98% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/SidedPlane.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/SidedPlane.java index ee421ce04c4..f12434d655b 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/SidedPlane.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/SidedPlane.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Tools.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Tools.java similarity index 96% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Tools.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/Tools.java index 5e33b28ecc3..e2000fa8ad2 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Tools.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Tools.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -39,4 +39,4 @@ public class Tools { return Math.acos(value); } -} \ No newline at end of file +} diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Vector.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java similarity index 99% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Vector.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java index 86714b37752..9d4b30b2384 100755 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Vector.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/package-info.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java similarity index 94% rename from lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/package-info.java rename to lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java index 2bdf3c3902a..2b6af740b51 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/package-info.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java @@ -18,4 +18,4 @@ /** * Shapes implemented using 3D planar geometry. */ -package org.apache.lucene.spatial.spatial4j.geo3d; \ No newline at end of file +package org.apache.lucene.geo3d; diff --git a/lucene/spatial3d/src/java/overview.html b/lucene/spatial3d/src/java/overview.html new file mode 100644 index 00000000000..152d06e6110 --- /dev/null +++ b/lucene/spatial3d/src/java/overview.html @@ -0,0 +1,29 @@ + + + + Apache Lucene Spatial3D Module + + + +

The Spatial3D Module for Apache Lucene

+ +

+ APIs for planar spatial3d math. +

+ + diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBoxTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoBBoxTest.java similarity index 99% rename from lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBoxTest.java rename to lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoBBoxTest.java index 0fbdf9eef3a..d5f3f79a2dc 100755 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBoxTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoBBoxTest.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoCircleTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java similarity index 99% rename from lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoCircleTest.java rename to lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java index 013cf6ebaba..e4470aebc91 100755 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoCircleTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoConvexPolygonTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoConvexPolygonTest.java similarity index 98% rename from lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoConvexPolygonTest.java rename to lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoConvexPolygonTest.java index 45c44fd9972..e260eee232c 100755 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoConvexPolygonTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoConvexPolygonTest.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoModelTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoModelTest.java similarity index 98% rename from lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoModelTest.java rename to lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoModelTest.java index b720ac61856..9eaa4b5df1e 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoModelTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoModelTest.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPathTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPathTest.java similarity index 99% rename from lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPathTest.java rename to lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPathTest.java index 18593669f33..46cb7406551 100755 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPathTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPathTest.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPolygonTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPolygonTest.java similarity index 99% rename from lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPolygonTest.java rename to lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPolygonTest.java index b44ee2bd2fd..fe89426682c 100755 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPolygonTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPolygonTest.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/PlaneTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/PlaneTest.java similarity index 97% rename from lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/PlaneTest.java rename to lucene/spatial3d/src/test/org/apache/lucene/geo3d/PlaneTest.java index a3337373b60..b01d4059a39 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/PlaneTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/PlaneTest.java @@ -1,4 +1,4 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; +package org.apache.lucene.geo3d; /* * Licensed to the Apache Software Foundation (ASF) under one or more