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

@@ -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

lucene/build.xml

@@ -188,6 +188,9 @@
     <check-missing-javadocs dir="build/docs/core/org/apache/lucene/search/similarities" level="method"/>
     <check-missing-javadocs dir="build/docs/core/org/apache/lucene/index" level="method"/>
     <check-missing-javadocs dir="build/docs/core/org/apache/lucene/codecs" level="method"/>
+
+    <!-- spatial3d: problems -->
+    <!-- <check-missing-javadocs dir="build/docs/spatial3d" level="method"/>--> 
   </target>
   
   <target name="-ecj-javadoc-lint" depends="compile,compile-test,-ecj-javadoc-lint-unsupported,-ecj-resolve" if="ecj-javadoc-lint.supported">

lucene/module-build.xml

@@ -585,6 +585,28 @@
     <property name="sandbox-javadocs.uptodate" value="true"/>
   </target>
 
+  <property name="spatial3d.jar" value="${common.dir}/build/spatial3d/lucene-spatial3d-${version}.jar"/>
+  <target name="check-spatial3d-uptodate" unless="spatial3d.uptodate">
+    <module-uptodate name="spatial3d" jarfile="${spatial3d.jar}" property="spatial3d.uptodate"/>
+  </target>
+  <target name="jar-spatial3d" unless="spatial3d.uptodate" depends="check-spatial3d-uptodate">
+  	<ant dir="${common.dir}/spatial3d" target="jar-core" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="spatial3d.uptodate" value="true"/>
+  </target>
+
+  <property name="spatial3d-javadoc.jar" value="${common.dir}/build/spatial3d/lucene-spatial3d-${version}-javadoc.jar"/>
+  <target name="check-spatial3d-javadocs-uptodate" unless="spatial3d-javadocs.uptodate">
+    <module-uptodate name="spatial3d" jarfile="${spatial3d-javadoc.jar}" property="spatial3d-javadocs.uptodate"/>
+  </target>
+  <target name="javadocs-spatial3d" unless="spatial3d-javadocs.uptodate" depends="check-spatial3d-javadocs-uptodate">
+    <ant dir="${common.dir}/spatial3d" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="spatial3d-javadocs.uptodate" value="true"/>
+  </target>
+
   <property name="spatial.jar" value="${common.dir}/build/spatial/lucene-spatial-${version}.jar"/>
   <target name="check-spatial-uptodate" unless="spatial.uptodate">
     <module-uptodate name="spatial" jarfile="${spatial.jar}" property="spatial.uptodate"/>

lucene/spatial/build.xml

@@ -33,6 +33,7 @@
     <path refid="spatialjar"/>
     <pathelement path="${queries.jar}" />
     <pathelement path="${misc.jar}" />
+    <pathelement path="${spatial3d.jar}" />
   </path>
 
   <path id="test.classpath">
@@ -41,14 +42,15 @@
     <pathelement path="src/test-files" />
   </path>
 
-  <target name="compile-core" depends="jar-queries,jar-misc,common.compile-core" />
+  <target name="compile-core" depends="jar-queries,jar-misc,jar-spatial3d,common.compile-core" />
 
-  <target name="javadocs" depends="javadocs-queries,javadocs-misc,compile-core,check-javadocs-uptodate"
+  <target name="javadocs" depends="javadocs-queries,javadocs-misc,javadocs-spatial3d,compile-core,check-javadocs-uptodate"
           unless="javadocs-uptodate-${name}">
     <invoke-module-javadoc>
       <links>
         <link href="../queries"/>
         <link href="../misc"/>
+        <link href="../spatial3d"/>
       </links>
     </invoke-module-javadoc>
   </target>

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.

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;

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;
 

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 {

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 {

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;
 
 /**

lucene/spatial3d/build.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+<project name="spatial3d" default="default">
+  <description>
+    3D spatial planar geometry APIs
+  </description>
+
+  <import file="../module-build.xml"/>
+
+  <path id="classpath">
+    <path refid="base.classpath"/>
+  </path>
+</project>

lucene/spatial3d/ivy.xml

@@ -0,0 +1,21 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="2.0">
+  <info organisation="org.apache.lucene" module="spatial3d"/>
+</ivy-module>

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

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

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

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

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

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
  */

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

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
  */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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.
    */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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();

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

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);
   }
 
-}
+}

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

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;
+package org.apache.lucene.geo3d;

lucene/spatial3d/src/java/overview.html

@@ -0,0 +1,29 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+  <head>
+    <title>Apache Lucene Spatial3D Module</title>
+  </head>
+  <body>
+
+  <h1>The Spatial3D Module for Apache Lucene</h1>
+
+  <p>
+    APIs for planar spatial3d math.
+  </p>
+  </body>
+</html>

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

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

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

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

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

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

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